diff options
-rw-r--r-- | arch/x86/xen/Makefile | 2 | ||||
-rw-r--r-- | arch/x86/xen/xen-ops.h | 2 | ||||
-rw-r--r-- | drivers/xen/Makefile | 2 | ||||
-rw-r--r-- | drivers/xen/events.c (renamed from arch/x86/xen/events.c) | 3 | ||||
-rw-r--r-- | include/xen/xen-ops.h | 8 |
5 files changed, 12 insertions, 5 deletions
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index c5e9aa489900..95c59260dccb 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | obj-y := enlighten.o setup.o multicalls.o mmu.o \ | 1 | obj-y := enlighten.o setup.o multicalls.o mmu.o \ |
2 | events.o time.o manage.o xen-asm.o | 2 | time.o manage.o xen-asm.o |
3 | 3 | ||
4 | obj-$(CONFIG_SMP) += smp.o | 4 | obj-$(CONFIG_SMP) += smp.o |
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index 22395d20dd6e..f1063ae08037 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <linux/init.h> | 4 | #include <linux/init.h> |
5 | #include <linux/irqreturn.h> | 5 | #include <linux/irqreturn.h> |
6 | #include <xen/xen-ops.h> | ||
6 | 7 | ||
7 | /* These are code, but not functions. Defined in entry.S */ | 8 | /* These are code, but not functions. Defined in entry.S */ |
8 | extern const char xen_hypervisor_callback[]; | 9 | extern const char xen_hypervisor_callback[]; |
@@ -10,7 +11,6 @@ extern const char xen_failsafe_callback[]; | |||
10 | 11 | ||
11 | void xen_copy_trap_info(struct trap_info *traps); | 12 | void xen_copy_trap_info(struct trap_info *traps); |
12 | 13 | ||
13 | DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu); | ||
14 | DECLARE_PER_CPU(unsigned long, xen_cr3); | 14 | DECLARE_PER_CPU(unsigned long, xen_cr3); |
15 | DECLARE_PER_CPU(unsigned long, xen_current_cr3); | 15 | DECLARE_PER_CPU(unsigned long, xen_current_cr3); |
16 | 16 | ||
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 609fdda90a34..823ce788b14b 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile | |||
@@ -1,2 +1,2 @@ | |||
1 | obj-y += grant-table.o features.o | 1 | obj-y += grant-table.o features.o events.o |
2 | obj-y += xenbus/ | 2 | obj-y += xenbus/ |
diff --git a/arch/x86/xen/events.c b/drivers/xen/events.c index 85bac298b3cb..c50d499b1e6f 100644 --- a/arch/x86/xen/events.c +++ b/drivers/xen/events.c | |||
@@ -33,12 +33,11 @@ | |||
33 | #include <asm/xen/hypercall.h> | 33 | #include <asm/xen/hypercall.h> |
34 | #include <asm/xen/hypervisor.h> | 34 | #include <asm/xen/hypervisor.h> |
35 | 35 | ||
36 | #include <xen/xen-ops.h> | ||
36 | #include <xen/events.h> | 37 | #include <xen/events.h> |
37 | #include <xen/interface/xen.h> | 38 | #include <xen/interface/xen.h> |
38 | #include <xen/interface/event_channel.h> | 39 | #include <xen/interface/event_channel.h> |
39 | 40 | ||
40 | #include "xen-ops.h" | ||
41 | |||
42 | /* | 41 | /* |
43 | * This lock protects updates to the following mapping and reference-count | 42 | * This lock protects updates to the following mapping and reference-count |
44 | * arrays. The lock does not need to be acquired to read the mapping tables. | 43 | * arrays. The lock does not need to be acquired to read the mapping tables. |
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h new file mode 100644 index 000000000000..10ddfe0142d0 --- /dev/null +++ b/include/xen/xen-ops.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef INCLUDE_XEN_OPS_H | ||
2 | #define INCLUDE_XEN_OPS_H | ||
3 | |||
4 | #include <linux/percpu.h> | ||
5 | |||
6 | DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu); | ||
7 | |||
8 | #endif /* INCLUDE_XEN_OPS_H */ | ||