aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/vmstat.h7
-rw-r--r--mm/vmstat.c2
2 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index 5fd71a7d0dfd..c586679b6fef 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -48,13 +48,8 @@ static inline void count_vm_events(enum vm_event_item item, long delta)
48} 48}
49 49
50extern void all_vm_events(unsigned long *); 50extern void all_vm_events(unsigned long *);
51#ifdef CONFIG_HOTPLUG 51
52extern void vm_events_fold_cpu(int cpu); 52extern void vm_events_fold_cpu(int cpu);
53#else
54static inline void vm_events_fold_cpu(int cpu)
55{
56}
57#endif
58 53
59#else 54#else
60 55
diff --git a/mm/vmstat.c b/mm/vmstat.c
index e1d8ed172c42..c823776f7059 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -52,7 +52,6 @@ void all_vm_events(unsigned long *ret)
52} 52}
53EXPORT_SYMBOL_GPL(all_vm_events); 53EXPORT_SYMBOL_GPL(all_vm_events);
54 54
55#ifdef CONFIG_HOTPLUG
56/* 55/*
57 * Fold the foreign cpu events into our own. 56 * Fold the foreign cpu events into our own.
58 * 57 *
@@ -69,7 +68,6 @@ void vm_events_fold_cpu(int cpu)
69 fold_state->event[i] = 0; 68 fold_state->event[i] = 0;
70 } 69 }
71} 70}
72#endif /* CONFIG_HOTPLUG */
73 71
74#endif /* CONFIG_VM_EVENT_COUNTERS */ 72#endif /* CONFIG_VM_EVENT_COUNTERS */
75 73