The patch titled
Redefine {un}register_hotcpu_notifier() !HOTPLUG_CPU stubs as static inline function
has been added to the -mm tree. Its filename is
redefine-unregister_hotcpu_notifier-hotplug_cpu.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Redefine {un}register_hotcpu_notifier() !HOTPLUG_CPU stubs as static inline function
From: Satyam Sharma <satyam@xxxxxxxxxxxxx>
The return of the present "do {} while" based stub definition of
register_hotcpu_notifier() cannot be checked, but the real HOTPLUG_CPU=y
implementation of register_hotcpu_notifier() is int-returning. So let us
make this stub consistent with the full version. Redefining this as such
will also help us remove some #ifdef-ery elsewhere in kernel code, as shown
in forthcoming patch. Also do the same for unregister_xxx case.
Signed-off-by: Satyam Sharma <satyam@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/cpu.h | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff -puN include/linux/cpu.h~redefine-unregister_hotcpu_notifier-hotplug_cpu include/linux/cpu.h
--- a/include/linux/cpu.h~redefine-unregister_hotcpu_notifier-hotplug_cpu
+++ a/include/linux/cpu.h
@@ -119,8 +119,13 @@ static inline void cpuhotplug_mutex_unlo
#define lock_cpu_hotplug() do { } while (0)
#define unlock_cpu_hotplug() do { } while (0)
#define hotcpu_notifier(fn, pri) do { (void)(fn); } while (0)
-#define register_hotcpu_notifier(nb) do { (void)(nb); } while (0)
-#define unregister_hotcpu_notifier(nb) do { (void)(nb); } while (0)
+static inline int register_hotcpu_notifier(struct notifier_block *nb)
+{
+ return 0;
+}
+static inline void unregister_hotcpu_notifier(struct notifier_block *nb)
+{
+}
/* CPUs don't go offline once they're online w/o CONFIG_HOTPLUG_CPU */
static inline int cpu_is_offline(int cpu) { return 0; }
_
Patches currently in -mm which might be from satyam@xxxxxxxxxxxxx are
origin.patch
ia64-tree-wide-misc-__cpuinitdata-init-exit.patch
git-ieee1394.patch
ehca_irq-misc-cpuinit-section-annotations-and-ifdef-cleanups.patch
git-netdev-all.patch
git-net.patch
s390-appldata_base-misc-cpuinit-annotations-and-bugfix.patch
s390-appldata_base-remove-module_exit-function-and-modular.patch
use-mutex-instead-of-semaphore-in-the-onstream-scsi-tape-driver.patch
ll_rw_blk-blk_cpu_notifier-should-be-__cpuinitdata.patch
intel_cacheinfo-misc-section-annotation-fixes.patch
intel_cacheinfo-call-cache_add_dev-from-cache_sysfs_init.patch
therm_throtc-fix-section-mismatch.patch
slub-slob-use-unlikely-for-kfreezero_or_null_ptr-check.patch
argv_split-allow-argv_split-to-handle-null-pointer-in-argcp-parameter-gracefully.patch
redefine-unregister_hotcpu_notifier-hotplug_cpu.patch
x86-msr-driver-misc-cpuinit-annotations.patch
i386-cpuid-misc-cpuinit-annotations.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
