aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/acpi.c
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2008-10-16 22:18:09 -0400
committerTony Luck <tony.luck@intel.com>2008-10-17 13:08:56 -0400
commita0df655ccd0669bd3efc85346dc816833dd1197f (patch)
tree1262e19ca7240e0bfe949a81da9b879b1976ea6e /arch/ia64/kernel/acpi.c
parentdcbbecdad53bd6273891ad018f9c6bb8f2b7813c (diff)
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.c5
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 @@
52#include <asm/numa.h> 52#include <asm/numa.h>
53#include <asm/sal.h> 53#include <asm/sal.h>
54#include <asm/cyclone.h> 54#include <asm/cyclone.h>
55#include <asm/xen/hypervisor.h>
55 56
56#define BAD_MADT_ENTRY(entry, end) ( \ 57#define BAD_MADT_ENTRY(entry, end) ( \
57 (!entry) || (unsigned long)entry + sizeof(*entry) > end || \ 58 (!entry) || (unsigned long)entry + sizeof(*entry) > end || \
@@ -121,6 +122,8 @@ acpi_get_sysname(void)
121 return "uv"; 122 return "uv";
122 else 123 else
123 return "sn2"; 124 return "sn2";
125 } else if (xen_pv_domain() && !strcmp(hdr->oem_id, "XEN")) {
126 return "xen";
124 } 127 }
125 128
126 return "dig"; 129 return "dig";
@@ -137,6 +140,8 @@ acpi_get_sysname(void)
137 return "uv"; 140 return "uv";
138# elif defined (CONFIG_IA64_DIG) 141# elif defined (CONFIG_IA64_DIG)
139 return "dig"; 142 return "dig";
143# elif defined (CONFIG_IA64_XEN_GUEST)
144 return "xen";
140# else 145# else
141# error Unknown platform. Fix acpi.c. 146# error Unknown platform. Fix acpi.c.
142# endif 147# endif