aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/acpi.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-08-13 09:25:03 +0200
committerTony Luck <tony.luck@intel.com>2019-08-16 11:33:57 -0700
commitfc5bad03709f9c79ea299f554b6f99fc6f4fe31c (patch)
treed02ddaa88a30e5885e8f0ce4a723415a7903a632 /arch/ia64/include/asm/acpi.h
parentia64: remove now unused machvec indirections (diff)
downloadlinux-dev-fc5bad03709f9c79ea299f554b6f99fc6f4fe31c.tar.xz
linux-dev-fc5bad03709f9c79ea299f554b6f99fc6f4fe31c.zip
ia64: remove the hpsim platform
The hpsim platform supports the HP IA64 simulator which was useful as a bring up platform. But it is fairly non-standard vs real IA64 system in that it for example doesn't support ACPI. It also comes with a whole bunch of simulator specific drivers. Remove it to simplify the IA64 port. Note that through a weird twist only them hpsim boot loader built the vmlinux.gz file, so the makefile targets for that are moved to the main ia64 Makefile now. Acked-by: Tom Vaden <tom.vaden@hpe.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://lkml.kernel.org/r/20190813072514.23299-18-hch@lst.de Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/include/asm/acpi.h')
-rw-r--r--arch/ia64/include/asm/acpi.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index 80c5ef8f475e..0afb3bc4b4a1 100644
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -37,9 +37,7 @@ const char *acpi_get_sysname (void);
#else
static inline const char *acpi_get_sysname (void)
{
-# if defined (CONFIG_IA64_HP_SIM)
- return "hpsim";
-# elif defined (CONFIG_IA64_HP_ZX1)
+# if defined (CONFIG_IA64_HP_ZX1)
return "hpzx1";
# elif defined (CONFIG_IA64_HP_ZX1_SWIOTLB)
return "hpzx1_swiotlb";