git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: page_mkwrite change prototype to match fault
[safe/jmp/linux-2.6]
/
mm
/
vmstat.c
diff --git
a/mm/vmstat.c
b/mm/vmstat.c
index
c3ccfda
..
9826766
100644
(file)
--- a/
mm/vmstat.c
+++ b/
mm/vmstat.c
@@
-20,14
+20,14
@@
DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}};
EXPORT_PER_CPU_SYMBOL(vm_event_states);
DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}};
EXPORT_PER_CPU_SYMBOL(vm_event_states);
-static void sum_vm_events(unsigned long *ret, c
pumask_t
*cpumask)
+static void sum_vm_events(unsigned long *ret, c
onst struct cpumask
*cpumask)
{
int cpu;
int i;
memset(ret, 0, NR_VM_EVENT_ITEMS * sizeof(unsigned long));
{
int cpu;
int i;
memset(ret, 0, NR_VM_EVENT_ITEMS * sizeof(unsigned long));
- for_each_cpu
_mask_nr(cpu, *
cpumask) {
+ for_each_cpu
(cpu,
cpumask) {
struct vm_event_state *this = &per_cpu(vm_event_states, cpu);
for (i = 0; i < NR_VM_EVENT_ITEMS; i++)
struct vm_event_state *this = &per_cpu(vm_event_states, cpu);
for (i = 0; i < NR_VM_EVENT_ITEMS; i++)
@@
-43,7
+43,7
@@
static void sum_vm_events(unsigned long *ret, cpumask_t *cpumask)
void all_vm_events(unsigned long *ret)
{
get_online_cpus();
void all_vm_events(unsigned long *ret)
{
get_online_cpus();
- sum_vm_events(ret,
&cpu_online_map
);
+ sum_vm_events(ret,
cpu_online_mask
);
put_online_cpus();
}
EXPORT_SYMBOL_GPL(all_vm_events);
put_online_cpus();
}
EXPORT_SYMBOL_GPL(all_vm_events);
@@
-135,11
+135,7
@@
static void refresh_zone_stat_thresholds(void)
int cpu;
int threshold;
int cpu;
int threshold;
- for_each_zone(zone) {
-
- if (!zone->present_pages)
- continue;
-
+ for_each_populated_zone(zone) {
threshold = calculate_threshold(zone);
for_each_online_cpu(cpu)
threshold = calculate_threshold(zone);
for_each_online_cpu(cpu)
@@
-301,12
+297,9
@@
void refresh_cpu_vm_stats(int cpu)
int i;
int global_diff[NR_VM_ZONE_STAT_ITEMS] = { 0, };
int i;
int global_diff[NR_VM_ZONE_STAT_ITEMS] = { 0, };
- for_each_zone(zone) {
+ for_each_
populated_
zone(zone) {
struct per_cpu_pageset *p;
struct per_cpu_pageset *p;
- if (!populated_zone(zone))
- continue;
-
p = zone_pcp(zone, cpu);
for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
p = zone_pcp(zone, cpu);
for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)