diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2008-10-17 06:18:09 +0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-10-17 21:08:56 +0400 |
| commit | a0df655ccd0669bd3efc85346dc816833dd1197f (patch) | |
| tree | 1262e19ca7240e0bfe949a81da9b879b1976ea6e /arch/ia64/kernel/acpi.c | |
| parent | dcbbecdad53bd6273891ad018f9c6bb8f2b7813c (diff) | |
| download | linux-a0df655ccd0669bd3efc85346dc816833dd1197f.tar.xz | |
ia64/xen: define xen machine vector for domU.
define xen machine vector for domU.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 5d1eb7ee2bf6..00936491933e 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -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 (xen_pv_domain() && !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_GUEST) + return "xen"; # else # error Unknown platform. Fix acpi.c. # endif |