[PATCH] x86_64: fix build without HOTPLUG_CPU (was Re: 2.6.19-rc6-mm1)

Jiri Kosina
2006-11-23T14:07:03Z

On Thu, 23 Nov 2006, Reuben Farrelly wrote:

> > http://userweb.kernel.org/~akpm/2.6.19-rc6-mm1/
> arch/x86_64/kernel/vsyscall.c: In function 'vsyscall_init':
> arch/x86_64/kernel/vsyscall.c:310: error: 'cpu_vsyscall_notifier' undeclared
> (first use in this function)
> arch/x86_64/kernel/vsyscall.c:310: error: (Each undeclared identifier is
> reported only once
> arch/x86_64/kernel/vsyscall.c:310: error: for each function it appears in.)
> make[1]: *** [arch/x86_64/kernel/vsyscall.o] Error 1
> make: *** [arch/x86_64/kernel] Error 2

[PATCH] x86_64: fix build without HOTPLUG_CPU

cpu_vsyscall_notifier() is defined only when CONFIG_HOTPLUG_CPU is
defined.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

---

arch/x86_64/kernel/vsyscall.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86_64/kernel/vsyscall.c b/arch/x86_64/kernel/vsyscall.c
index 3416462..e93ffcf 100644
--- a/arch/x86_64/kernel/vsyscall.c
+++ b/arch/x86_64/kernel/vsyscall.c
@@ -307,7 +307,9 @@ #ifdef CONFIG_SYSCTL
register_sysctl_table(kernel_root_table2, 0);
#endif
on_each_cpu(cpu_vsyscall_init, NULL, 0, 1);
+#ifdef CONFIG_HOTPLUG_CPU
hotcpu_notifier(cpu_vsyscall_notifier, 0);
+#endif
return 0;
}

--
Jiri Kosina
SUSE Labs