diff options
| author | Jack Steiner <steiner@sgi.com> | 2008-05-06 15:18:57 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-05-14 14:22:04 -0700 |
| commit | 2224661494278bfc1c35b392cf6ee6f58e1d5e64 (patch) | |
| tree | 1a0bd165aedfd28191a017901490c5bf3fd9f328 /arch/ia64/kernel/acpi.c | |
| parent | 7868f1ed84696d3cca83558e8dd459f20a36d077 (diff) | |
| download | op-kernel-dev-2224661494278bfc1c35b392cf6ee6f58e1d5e64.zip op-kernel-dev-2224661494278bfc1c35b392cf6ee6f58e1d5e64.tar.gz | |
[IA64] machvec support for SGI UV platform
This patch adds the basic IA64 machvec infrastructure to support
the SGI "UV" platform.
Signed-off-by: Jack Steiner <steiner@sgi.com>
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 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 19709a0..6ff6815 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -117,7 +117,10 @@ acpi_get_sysname(void) if (!strcmp(hdr->oem_id, "HP")) { return "hpzx1"; } else if (!strcmp(hdr->oem_id, "SGI")) { - return "sn2"; + if (!strcmp(hdr->oem_table_id + 4, "UV")) + return "uv"; + else + return "sn2"; } return "dig"; @@ -130,6 +133,8 @@ acpi_get_sysname(void) return "hpzx1_swiotlb"; # elif defined (CONFIG_IA64_SGI_SN2) return "sn2"; +# elif defined (CONFIG_IA64_SGI_UV) + return "uv"; # elif defined (CONFIG_IA64_DIG) return "dig"; # else |
