diff options
author | Isaku Yamahata <yamahata@valinux.co.jp> | 2008-10-14 20:50:43 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-22 09:10:50 -0400 |
commit | a5af4eb16618dba52321fe420e2c93e815fcd762 (patch) | |
tree | da16b158ae2085a2efe33016cb2c85f3f92aa8c7 | |
parent | 85192bdb6221a5b8ba457f6e3ce4d9729220efb0 (diff) |
xen: compilation fix fo xen CPU hotplugging
This patch fixes compilation error on ia64.
include asm/xen/hypervisor.h instead of asm-x86/xen/hypervisor.h
use xen_pv_domain() instead of is_running_on_xen()
> CC drivers/xen/cpu_hotplug.o
> In file included from /linux-2.6/drivers/xen/cpu_hotplug.c:5:
> /linux-2.6/include/asm-x86/xen/hypervisor.h:44:22: error: asm/desc.h: No such file or directory
> /linux-2.6/include/asm-x86/xen/hypervisor.h:66:1: warning: "MULTI_UVMFLAGS_INDEX" redefined
> In file included from /linux-2.6/include/asm-x86/xen/hypervisor.h:52,
> from /linux-2.6/drivers/xen/cpu_hotplug.c:5:
> /linux-2.6/arch/ia64/include/asm/xen/hypercall.h:233:1: warning: this is the location of the previous definition
> /linux-2.6/drivers/xen/cpu_hotplug.c: In function 'setup_vcpu_hotplug_event':
> /linux-2.6/drivers/xen/cpu_hotplug.c:81: error: implicit declaration of function 'is_running_on_xen'
> make[4]: *** [drivers/xen/cpu_hotplug.o] Error 1
> make[4]: *** Waiting for unfinished jobs....
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | drivers/xen/cpu_hotplug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c index 565280ec1c6a..974f56d1ebe1 100644 --- a/drivers/xen/cpu_hotplug.c +++ b/drivers/xen/cpu_hotplug.c | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | #include <xen/xenbus.h> | 3 | #include <xen/xenbus.h> |
4 | 4 | ||
5 | #include <asm-x86/xen/hypervisor.h> | 5 | #include <asm/xen/hypervisor.h> |
6 | #include <asm/cpu.h> | 6 | #include <asm/cpu.h> |
7 | 7 | ||
8 | static void enable_hotplug_cpu(int cpu) | 8 | static void enable_hotplug_cpu(int cpu) |