diff options
| author | Tony Luck <tony.luck@intel.com> | 2010-02-26 12:04:22 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2010-02-26 12:04:22 -0800 |
| commit | 65c9bb6cca78a3677c66c6b279d5d77aa863bb32 (patch) | |
| tree | 626345aac319521905213bf249554c0c7aaa44d6 /arch/ia64/include/asm | |
| parent | 8d6339b8a532ec4eeb31db321cf1e6068965deda (diff) | |
| parent | e72aca30837d9c0ee287d18a092fc76a38a3b81d (diff) | |
Pull alex into release branch
Diffstat (limited to 'arch/ia64/include/asm')
| -rw-r--r-- | arch/ia64/include/asm/acpi.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h index e97b255d97bc..d3b48305a08f 100644 --- a/arch/ia64/include/asm/acpi.h +++ b/arch/ia64/include/asm/acpi.h @@ -99,7 +99,32 @@ ia64_acpi_release_global_lock (unsigned int *lock) #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */ static inline void disable_acpi(void) { } +#ifdef CONFIG_IA64_GENERIC 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) + return "hpzx1"; +# elif defined (CONFIG_IA64_HP_ZX1_SWIOTLB) + 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"; +# elif defined (CONFIG_IA64_XEN_GUEST) + return "xen"; +# elif defined(CONFIG_IA64_DIG_VTD) + return "dig_vtd"; +# else +# error Unknown platform. Fix acpi.c. +# endif +} +#endif int acpi_request_vector (u32 int_type); int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); |