ia64/xen: define xen machine vector for domU.
PATCH 22/23 ia64/xen: define xen machine vector for domU.
define xen machine vector for domU.
Signed-off-by Isaku Yamahata <[email protected]>
--- arch/ia64/Makefile | 2 ++ arch/ia64/kernel/acpi.c | 5 +++++ arch/ia64/xen/Makefile | 2 ++ arch/ia64/xen/machvec.c | 4 ++++ include/asm-ia64/machvec.h | 2 ++ include/asm-ia64/machvec_xen.h | 22 ++++++++++++++++++++++ 6 files changed, 37 insertions(+), 0 deletions(-) create mode 100644 arch/ia64/xen/machvec.c create mode 100644 include/asm-ia64/machvec_xen.h
arch/ia64/Makefile +2 -0
@@ -56,7 +56,9 @@ core-$(CONFIG_IA64_DIG) += arch/ia64/dig/ core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ +core-$(CONFIG_IA64_XEN) += arch/ia64/dig/ core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/ +core-$(CONFIG_XEN) += arch/ia64/xen/ drivers-$(CONFIG_PCI) += arch/ia64/pci/ drivers-$(CONFIG_IA64_HP_SIM) += arch/ia64/hp/sim/
arch/ia64/kernel/acpi.c +5 -0
@@ -52,6 +52,7 @@#include <asm/numa.h> #include <asm/sal.h> #include <asm/cyclone.h> +#include <asm/xen/hypervisor.h> #define BAD_MADT_ENTRY (entry, end) ( \ (!entry) || (unsigned long)entry + sizeof(*entry) > end || \
@@ -118,6 +119,8 @@ acpi_get_sysname(void)return "hpzx1" ; }else if (!strcmp (hdr->oem_id,"SGI" )) {return "sn2" ; + }else if (is_running_on_xen () && !strcmp (hdr->oem_id,"XEN" )) { +return "xen" ; }return "dig" ;
@@ -132,6 +135,8 @@ acpi_get_sysname(void)return "sn2" ;# elif defined (CONFIG_IA64_DIG )return "dig" ; +# elif defined (CONFIG_IA64_XEN ) +return "xen" ;# else # error Unknown platform. Fix acpi.c.# endif
arch/ia64/xen/Makefile +2 -0
@@ -5,6 +5,8 @@ obj-y := hypercall.o xenivt.o xensetup.o xen_pv_ops.o irq_xen.o \ hypervisor.o xencomm.o xcom_hcall.o grant-table.o time.o +obj-$(CONFIG_IA64_GENERIC) += machvec.o + AFLAGS_xenivt.o += -D__IA64_ASM_PARAVIRTUALIZED_XEN # xen multi compile
arch/ia64/xen/machvec.c new file +4 -0
@@ -0,0 +1,4 @@ +#define MACHVEC_PLATFORM_NAME xen +#define MACHVEC_PLATFORM_HEADER <asm/machvec_xen.h> +#include <asm/machvec_init.h> +
include/asm-ia64/machvec.h +2 -0
@@ -120,6 +120,8 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *);# include <asm/machvec_hpzx1_swiotlb.h> # elif defined (CONFIG_IA64_SGI_SN2 )# include <asm/machvec_sn2.h> +# elif defined (CONFIG_IA64_XEN ) +# include <asm/machvec_xen.h> # elif defined (CONFIG_IA64_GENERIC )# ifdef MACHVEC_PLATFORM_HEADER
include/asm-ia64/machvec_xen.h new file +22 -0
@@ -0,0 +1,22 @@ +#ifndef _ASM_IA64_MACHVEC_XEN_h +#define _ASM_IA64_MACHVEC_XEN_h + +extern ia64_mv_setup_t dig_setup; +extern ia64_mv_cpu_init_t xen_cpu_init; +extern ia64_mv_irq_init_t xen_irq_init; +extern ia64_mv_send_ipi_t xen_platform_send_ipi; + +/* +* This stuff has dual use! +* +* For a generic kernel, the macros are used to initialize the +* platform's machvec structure. When compiling a non-generic kernel, +* the macros are used directly. +*/ +#define platform_name "xen" +#define platform_setup dig_setup +#define platform_cpu_init xen_cpu_init +#define platform_irq_init xen_irq_init +#define platform_send_ipi xen_platform_send_ipi + +#endif /* _ASM_IA64_MACHVEC_XEN_h */
Signature · 1 line
1.5.3
PATCH 22/23 ia64/xen: define xen machine vector for domU.
define xen machine vector for domU.
Signed-off-by Isaku Yamahata <[email protected]>
--- arch/ia64/Makefile | 2 ++ arch/ia64/kernel/acpi.c | 5 +++++ arch/ia64/xen/Makefile | 2 ++ arch/ia64/xen/machvec.c | 4 ++++ include/asm-ia64/machvec.h | 2 ++ include/asm-ia64/machvec_xen.h | 22 ++++++++++++++++++++++ 6 files changed, 37 insertions(+), 0 deletions(-) create mode 100644 arch/ia64/xen/machvec.c create mode 100644 include/asm-ia64/machvec_xen.h
arch/ia64/Makefile +2 -0
@@ -56,8 +56,10 @@ core-$(CONFIG_IA64_DIG) += arch/ia64/dig/ core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ +core-$(CONFIG_IA64_XEN) += arch/ia64/dig/ core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/ core-$(CONFIG_KVM) += arch/ia64/kvm/ +core-$(CONFIG_XEN) += arch/ia64/xen/ drivers-$(CONFIG_PCI) += arch/ia64/pci/ drivers-$(CONFIG_IA64_HP_SIM) += arch/ia64/hp/sim/
arch/ia64/kernel/acpi.c +5 -0
@@ -52,6 +52,7 @@#include <asm/numa.h> #include <asm/sal.h> #include <asm/cyclone.h> +#include <asm/xen/hypervisor.h> #define BAD_MADT_ENTRY (entry, end) ( \ (!entry) || (unsigned long)entry + sizeof(*entry) > end || \
@@ -118,6 +119,8 @@ acpi_get_sysname(void)return "hpzx1" ; }else if (!strcmp (hdr->oem_id,"SGI" )) {return "sn2" ; + }else if (is_running_on_xen () && !strcmp (hdr->oem_id,"XEN" )) { +return "xen" ; }return "dig" ;
@@ -132,6 +135,8 @@ acpi_get_sysname(void)return "sn2" ;# elif defined (CONFIG_IA64_DIG )return "dig" ; +# elif defined (CONFIG_IA64_XEN ) +return "xen" ;# else # error Unknown platform. Fix acpi.c.# endif
arch/ia64/xen/Makefile +2 -0
@@ -5,6 +5,8 @@ obj-y := hypercall.o xenivt.o xensetup.o xen_pv_ops.o irq_xen.o \ hypervisor.o xencomm.o xcom_hcall.o grant-table.o time.o +obj-$(CONFIG_IA64_GENERIC) += machvec.o + AFLAGS_xenivt.o += -D__IA64_ASM_PARAVIRTUALIZED_XEN # xen multi compile
arch/ia64/xen/machvec.c new file +4 -0
@@ -0,0 +1,4 @@ +#define MACHVEC_PLATFORM_NAME xen +#define MACHVEC_PLATFORM_HEADER <asm/machvec_xen.h> +#include <asm/machvec_init.h> +
include/asm-ia64/machvec.h +2 -0
@@ -126,6 +126,8 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *);# include <asm/machvec_hpzx1_swiotlb.h> # elif defined (CONFIG_IA64_SGI_SN2 )# include <asm/machvec_sn2.h> +# elif defined (CONFIG_IA64_XEN ) +# include <asm/machvec_xen.h> # elif defined (CONFIG_IA64_GENERIC )# ifdef MACHVEC_PLATFORM_HEADER
include/asm-ia64/machvec_xen.h new file +22 -0
@@ -0,0 +1,22 @@ +#ifndef _ASM_IA64_MACHVEC_XEN_h +#define _ASM_IA64_MACHVEC_XEN_h + +extern ia64_mv_setup_t dig_setup; +extern ia64_mv_cpu_init_t xen_cpu_init; +extern ia64_mv_irq_init_t xen_irq_init; +extern ia64_mv_send_ipi_t xen_platform_send_ipi; + +/* +* This stuff has dual use! +* +* For a generic kernel, the macros are used to initialize the +* platform's machvec structure. When compiling a non-generic kernel, +* the macros are used directly. +*/ +#define platform_name "xen" +#define platform_setup dig_setup +#define platform_cpu_init xen_cpu_init +#define platform_irq_init xen_irq_init +#define platform_send_ipi xen_platform_send_ipi + +#endif /* _ASM_IA64_MACHVEC_XEN_h */
Signature · 1 line
1.5.3
PATCH 22/23 ia64/xen: define xen machine vector for domU.
In reply to Isaku Yamahatadefine xen machine vector for domU.
Signed-off-by Isaku Yamahata <[email protected]>
--- arch/ia64/Makefile | 2 ++ arch/ia64/kernel/acpi.c | 5 +++++ arch/ia64/xen/Makefile | 2 ++ arch/ia64/xen/machvec.c | 4 ++++ include/asm-ia64/machvec.h | 2 ++ include/asm-ia64/machvec_xen.h | 22 ++++++++++++++++++++++ 6 files changed, 37 insertions(+), 0 deletions(-) create mode 100644 arch/ia64/xen/machvec.c create mode 100644 include/asm-ia64/machvec_xen.h
arch/ia64/Makefile +2 -0
@@ -56,8 +56,10 @@ core-$(CONFIG_IA64_DIG) += arch/ia64/dig/ core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ +core-$(CONFIG_IA64_XEN) += arch/ia64/dig/ core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/ core-$(CONFIG_KVM) += arch/ia64/kvm/ +core-$(CONFIG_XEN) += arch/ia64/xen/ drivers-$(CONFIG_PCI) += arch/ia64/pci/ drivers-$(CONFIG_IA64_HP_SIM) += arch/ia64/hp/sim/
arch/ia64/kernel/acpi.c +5 -0
@@ -52,6 +52,7 @@#include <asm/numa.h> #include <asm/sal.h> #include <asm/cyclone.h> +#include <asm/xen/hypervisor.h> #define BAD_MADT_ENTRY (entry, end) ( \ (!entry) || (unsigned long)entry + sizeof(*entry) > end || \
@@ -121,6 +122,8 @@ acpi_get_sysname(void)return "uv" ; else return "sn2"; + }else if (is_running_on_xen () && !strcmp (hdr->oem_id,"XEN" )) { +return "xen" ; }return "dig" ;
@@ -137,6 +140,8 @@ acpi_get_sysname(void)return "uv" ;# elif defined (CONFIG_IA64_DIG )return "dig" ; +# elif defined (CONFIG_IA64_XEN ) +return "xen" ;# else # error Unknown platform. Fix acpi.c.# endif
arch/ia64/xen/Makefile +2 -0
@@ -5,6 +5,8 @@ obj-y := hypercall.o xenivt.o xensetup.o xen_pv_ops.o irq_xen.o \ hypervisor.o xencomm.o xcom_hcall.o grant-table.o time.o +obj-$(CONFIG_IA64_GENERIC) += machvec.o + AFLAGS_xenivt.o += -D__IA64_ASM_PARAVIRTUALIZED_XEN # xen multi compile
arch/ia64/xen/machvec.c new file +4 -0
@@ -0,0 +1,4 @@ +#define MACHVEC_PLATFORM_NAME xen +#define MACHVEC_PLATFORM_HEADER <asm/machvec_xen.h> +#include <asm/machvec_init.h> +
include/asm-ia64/machvec.h +2 -0
@@ -128,6 +128,8 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *);# include <asm/machvec_sn2.h> # elif defined (CONFIG_IA64_SGI_UV )# include <asm/machvec_uv.h> +# elif defined (CONFIG_IA64_XEN ) +# include <asm/machvec_xen.h> # elif defined (CONFIG_IA64_GENERIC )# ifdef MACHVEC_PLATFORM_HEADER
include/asm-ia64/machvec_xen.h new file +22 -0
@@ -0,0 +1,22 @@ +#ifndef _ASM_IA64_MACHVEC_XEN_h +#define _ASM_IA64_MACHVEC_XEN_h + +extern ia64_mv_setup_t dig_setup; +extern ia64_mv_cpu_init_t xen_cpu_init; +extern ia64_mv_irq_init_t xen_irq_init; +extern ia64_mv_send_ipi_t xen_platform_send_ipi; + +/* +* This stuff has dual use! +* +* For a generic kernel, the macros are used to initialize the +* platform's machvec structure. When compiling a non-generic kernel, +* the macros are used directly. +*/ +#define platform_name "xen" +#define platform_setup dig_setup +#define platform_cpu_init xen_cpu_init +#define platform_irq_init xen_irq_init +#define platform_send_ipi xen_platform_send_ipi + +#endif /* _ASM_IA64_MACHVEC_XEN_h */
Signature · 1 line
1.5.3