diff --git a/[refs] b/[refs] index 5381d697eec0..b8514872ee4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67af63a6ab4ce064f807bdce614fe0fa2bcea252 +refs/heads/master: e903387f1ebe3a7ddb93cd49c38341d3632df528 diff --git a/trunk/include/linux/vmstat.h b/trunk/include/linux/vmstat.h index 532360010919..5e9803ed17fc 100644 --- a/trunk/include/linux/vmstat.h +++ b/trunk/include/linux/vmstat.h @@ -74,7 +74,13 @@ static inline void count_vm_events(enum vm_event_item item, long delta) } extern void all_vm_events(unsigned long *); +#ifdef CONFIG_HOTPLUG extern void vm_events_fold_cpu(int cpu); +#else +static inline void vm_events_fold_cpu(int cpu) +{ +} +#endif #else