diff options
author | Jan Beulich <jbeulich@suse.com> | 2012-01-12 13:45:47 +0100 |
---|---|---|
committer | Jan Beulich <jbeulich@suse.com> | 2012-01-12 13:45:47 +0100 |
commit | 88236844fcf743405eda2ad5fd4dcbb1a8ab6d9a (patch) | |
tree | 3a6e1ce2ffb07614defaa1e978b518e1ae493b0f | |
parent | 4563b03488191fcafbb28c6212377f35c94968f1 (diff) | |
download | xen-88236844fcf743405eda2ad5fd4dcbb1a8ab6d9a.tar.gz xen-88236844fcf743405eda2ad5fd4dcbb1a8ab6d9a.tar.bz2 xen-88236844fcf743405eda2ad5fd4dcbb1a8ab6d9a.zip |
move declarations of some required per-arch functions into common headers
... since it is pointless to have each arch declare them on their own
(and now and the - see ia64 - forget to do so).
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
-rw-r--r-- | xen/arch/ia64/xen/dom0_ops.c | 1 | ||||
-rw-r--r-- | xen/arch/ia64/xen/domain.c | 1 | ||||
-rw-r--r-- | xen/arch/ia64/xen/xensetup.c | 2 | ||||
-rw-r--r-- | xen/arch/x86/domain.c | 2 | ||||
-rw-r--r-- | xen/arch/x86/x86_64/domain.c | 2 | ||||
-rw-r--r-- | xen/common/kernel.c | 5 | ||||
-rw-r--r-- | xen/include/asm-ia64/hypercall.h | 3 | ||||
-rw-r--r-- | xen/include/asm-x86/hypercall.h | 10 | ||||
-rw-r--r-- | xen/include/asm-x86/setup.h | 2 | ||||
-rw-r--r-- | xen/include/xen/hypercall.h | 14 |
10 files changed, 20 insertions, 22 deletions
diff --git a/xen/arch/ia64/xen/dom0_ops.c b/xen/arch/ia64/xen/dom0_ops.c index eb4c3fc9f1..a372d58221 100644 --- a/xen/arch/ia64/xen/dom0_ops.c +++ b/xen/arch/ia64/xen/dom0_ops.c @@ -19,6 +19,7 @@ #include <xen/console.h> #include <xen/grant_table.h> #include <xen/guest_access.h> +#include <xen/hypercall.h> #include <xen/pci.h> #include <asm/vmx.h> #include <asm/dom_fw.h> diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c index c9cf902fb1..1ea5a9065c 100644 --- a/xen/arch/ia64/xen/domain.c +++ b/xen/arch/ia64/xen/domain.c @@ -31,6 +31,7 @@ #include <asm/processor.h> #include <xen/event.h> #include <xen/console.h> +#include <xen/hypercall.h> #include <xen/version.h> #include <xen/libelf.h> #include <asm/pgalloc.h> diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c index 31bbac916a..35d3fe2c8b 100644 --- a/xen/arch/ia64/xen/xensetup.c +++ b/xen/arch/ia64/xen/xensetup.c @@ -10,7 +10,7 @@ #include <xen/multiboot.h> #include <xen/sched.h> #include <xen/mm.h> -#include <public/version.h> +#include <xen/hypercall.h> #include <xen/gdbstub.h> #include <xen/version.h> #include <xen/console.h> diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 532c0ec379..0c85cbb130 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -23,6 +23,7 @@ #include <xen/grant_table.h> #include <xen/iocap.h> #include <xen/kernel.h> +#include <xen/hypercall.h> #include <xen/multicall.h> #include <xen/irq.h> #include <xen/event.h> @@ -46,7 +47,6 @@ #include <asm/xstate.h> #include <asm/mpspec.h> #include <asm/ldt.h> -#include <asm/hypercall.h> #include <asm/fixmap.h> #include <asm/hvm/hvm.h> #include <asm/hvm/support.h> diff --git a/xen/arch/x86/x86_64/domain.c b/xen/arch/x86/x86_64/domain.c index 9c46593da6..e746c89d10 100644 --- a/xen/arch/x86/x86_64/domain.c +++ b/xen/arch/x86/x86_64/domain.c @@ -6,7 +6,7 @@ #include <xen/config.h> #include <xen/types.h> #include <xen/guest_access.h> -#include <asm/hypercall.h> +#include <xen/hypercall.h> #include <compat/vcpu.h> #define xen_vcpu_info vcpu_info diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 7decc1d70d..88984d2355 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -13,13 +13,10 @@ #include <xen/paging.h> #include <xen/nmi.h> #include <xen/guest_access.h> +#include <xen/hypercall.h> #include <asm/current.h> #include <public/nmi.h> #include <public/version.h> -#ifdef CONFIG_X86 -#include <asm/shared.h> -#include <asm/setup.h> -#endif #ifndef COMPAT diff --git a/xen/include/asm-ia64/hypercall.h b/xen/include/asm-ia64/hypercall.h index 0af7ebcee5..37846bc535 100644 --- a/xen/include/asm-ia64/hypercall.h +++ b/xen/include/asm-ia64/hypercall.h @@ -22,7 +22,4 @@ vmx_do_mmu_update( u64 *pdone, u64 foreigndom); -extern long -arch_do_vcpu_op(int cmd, struct vcpu *v, XEN_GUEST_HANDLE(void) arg); - #endif /* __ASM_IA64_HYPERCALL_H__ */ diff --git a/xen/include/asm-x86/hypercall.h b/xen/include/asm-x86/hypercall.h index a27698ef9e..9e136c3210 100644 --- a/xen/include/asm-x86/hypercall.h +++ b/xen/include/asm-x86/hypercall.h @@ -90,16 +90,6 @@ extern unsigned long do_iret( void); -struct vcpu; -extern long -arch_do_vcpu_op( - int cmd, struct vcpu *v, XEN_GUEST_HANDLE(void) arg); - -extern long -arch_do_sysctl( - struct xen_sysctl *op, - XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl); - extern int do_kexec( unsigned long op, unsigned arg1, XEN_GUEST_HANDLE(void) uarg); diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h index aeabb50423..b983c97773 100644 --- a/xen/include/asm-x86/setup.h +++ b/xen/include/asm-x86/setup.h @@ -2,7 +2,6 @@ #define __X86_SETUP_H_ #include <xen/multiboot.h> -#include <public/version.h> extern bool_t early_boot; extern unsigned long xenheap_initial_phys_start; @@ -40,7 +39,6 @@ unsigned long initial_images_nrpages(void); void discard_initial_images(void); int xen_in_range(unsigned long mfn); -void arch_get_xen_caps(xen_capabilities_info_t *info); void microcode_grab_module( unsigned long *, const multiboot_info_t *, void *(*)(const module_t *)); diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index 70ccfdf722..3d099a65cd 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -14,6 +14,7 @@ #include <public/platform.h> #include <public/event_channel.h> #include <public/tmem.h> +#include <public/version.h> #include <asm/hypercall.h> #include <xsm/xsm.h> @@ -45,6 +46,11 @@ do_sysctl( XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl); extern long +arch_do_sysctl( + struct xen_sysctl *sysctl, + XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl); + +extern long do_platform_op( XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op); @@ -102,6 +108,12 @@ do_vcpu_op( int vcpuid, XEN_GUEST_HANDLE(void) arg); +struct vcpu; +extern long +arch_do_vcpu_op(int cmd, + struct vcpu *v, + XEN_GUEST_HANDLE(void) arg); + extern long do_nmi_op( unsigned int cmd, @@ -167,4 +179,6 @@ compat_set_timer_op( #endif +void arch_get_xen_caps(xen_capabilities_info_t *info); + #endif /* __XEN_HYPERCALL_H__ */ |