The patch titled
Subject: mm: remove CONFIG_HOTPLUG ifdefs
has been removed from the -mm tree. Its filename was
mm-remove-config_hotplug-ifdefs.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Yijing Wang <wangyijing@xxxxxxxxxx>
Subject: mm: remove CONFIG_HOTPLUG ifdefs
CONFIG_HOTPLUG is going away as an option, cleanup CONFIG_HOTPLUG
ifdefs in mm files.
Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx>
Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Rik van Riel <riel@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/vmstat.h | 7 +------
mm/vmstat.c | 2 --
2 files changed, 1 insertion(+), 8 deletions(-)
diff -puN include/linux/vmstat.h~mm-remove-config_hotplug-ifdefs include/linux/vmstat.h
--- a/include/linux/vmstat.h~mm-remove-config_hotplug-ifdefs
+++ a/include/linux/vmstat.h
@@ -48,13 +48,8 @@ static inline void count_vm_events(enum
}
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
diff -puN mm/vmstat.c~mm-remove-config_hotplug-ifdefs mm/vmstat.c
--- a/mm/vmstat.c~mm-remove-config_hotplug-ifdefs
+++ a/mm/vmstat.c
@@ -52,7 +52,6 @@ void all_vm_events(unsigned long *ret)
}
EXPORT_SYMBOL_GPL(all_vm_events);
-#ifdef CONFIG_HOTPLUG
/*
* Fold the foreign cpu events into our own.
*
@@ -69,7 +68,6 @@ void vm_events_fold_cpu(int cpu)
fold_state->event[i] = 0;
}
}
-#endif /* CONFIG_HOTPLUG */
#endif /* CONFIG_VM_EVENT_COUNTERS */
_
Patches currently in -mm which might be from wangyijing@xxxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
