diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-12-06 23:38:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:39 -0500 |
commit | 02316067852187b8bec781bec07410e91af79627 (patch) | |
tree | 856e3f4610c91a6548bf3bf5c70ecbc0b28a4145 /kernel/cpuset.c | |
parent | a38a44c1a93078fc5fadc4ac2df8dea4697069e2 (diff) |
[PATCH] hotplug CPU: clean up hotcpu_notifier() use
There was lots of #ifdef noise in the kernel due to hotcpu_notifier(fn,
prio) not correctly marking 'fn' as used in the !HOTPLUG_CPU case, and thus
generating compiler warnings of unused symbols, hence forcing people to add
#ifdefs.
the compiler can skip truly unused functions just fine:
text data bss dec hex filename
1624412 728710 3674856 6027978 5bfaca vmlinux.before
1624412 728710 3674856 6027978 5bfaca vmlinux.after
[akpm@osdl.org: topology.c fix]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/cpuset.c')
-rw-r--r-- | kernel/cpuset.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index bd1e89c4c96a..9b62b4c03ad0 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
@@ -2044,7 +2044,6 @@ out: | |||
2044 | return err; | 2044 | return err; |
2045 | } | 2045 | } |
2046 | 2046 | ||
2047 | #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG) | ||
2048 | /* | 2047 | /* |
2049 | * If common_cpu_mem_hotplug_unplug(), below, unplugs any CPUs | 2048 | * If common_cpu_mem_hotplug_unplug(), below, unplugs any CPUs |
2050 | * or memory nodes, we need to walk over the cpuset hierarchy, | 2049 | * or memory nodes, we need to walk over the cpuset hierarchy, |
@@ -2108,9 +2107,7 @@ static void common_cpu_mem_hotplug_unplug(void) | |||
2108 | mutex_unlock(&callback_mutex); | 2107 | mutex_unlock(&callback_mutex); |
2109 | mutex_unlock(&manage_mutex); | 2108 | mutex_unlock(&manage_mutex); |
2110 | } | 2109 | } |
2111 | #endif | ||
2112 | 2110 | ||
2113 | #ifdef CONFIG_HOTPLUG_CPU | ||
2114 | /* | 2111 | /* |
2115 | * The top_cpuset tracks what CPUs and Memory Nodes are online, | 2112 | * The top_cpuset tracks what CPUs and Memory Nodes are online, |
2116 | * period. This is necessary in order to make cpusets transparent | 2113 | * period. This is necessary in order to make cpusets transparent |
@@ -2127,7 +2124,6 @@ static int cpuset_handle_cpuhp(struct notifier_block *nb, | |||
2127 | common_cpu_mem_hotplug_unplug(); | 2124 | common_cpu_mem_hotplug_unplug(); |
2128 | return 0; | 2125 | return 0; |
2129 | } | 2126 | } |
2130 | #endif | ||
2131 | 2127 | ||
2132 | #ifdef CONFIG_MEMORY_HOTPLUG | 2128 | #ifdef CONFIG_MEMORY_HOTPLUG |
2133 | /* | 2129 | /* |