From d8d32c4bb20962831afc456b087d7ecf310079c7 Mon Sep 17 00:00:00 2001 From: Satyam Sharma Date: Thu, 18 Oct 2007 03:06:38 -0700 Subject: [PATCH] --- yaml --- r: 71205 b: refs/heads/master c: 761bb431908e84d1793c5eb6c2ae2cc4926bed3e h: refs/heads/master i: 71203: b16061cdcdda6795f3635f76664335418304a17f v: v3 --- [refs] | 2 +- trunk/include/linux/cpu.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 57e5c1aef0b3..f43b1d2b1f6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4603ac180a824197c2262747948d0179eb076e9c +refs/heads/master: 761bb431908e84d1793c5eb6c2ae2cc4926bed3e diff --git a/trunk/include/linux/cpu.h b/trunk/include/linux/cpu.h index 0ad72c4cf312..b79c57569367 100644 --- a/trunk/include/linux/cpu.h +++ b/trunk/include/linux/cpu.h @@ -119,8 +119,9 @@ static inline void cpuhotplug_mutex_unlock(struct mutex *cpu_hp_mutex) #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) +/* These aren't inline functions due to a GCC bug. */ +#define register_hotcpu_notifier(nb) ({ (void)(nb); 0; }) +#define unregister_hotcpu_notifier(nb) ({ (void)(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; }