summaryrefslogtreecommitdiff
path: root/arch/ia64/include/asm/acpi.h
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-02-10 16:17:10 +0300
committerPatrick McHardy <kaber@trash.net>2010-02-10 16:17:10 +0300
commit9ab99d5a43e9f283738fd9fd365539306d13eaac (patch)
tree0214a63e3f4f7f4f187f0139e4a5d8abe453902b /arch/ia64/include/asm/acpi.h
parent76780373190d7e8ddfb6fed06aef068e2445c743 (diff)
parentb1109bf085c8dd69537b7876ea83f914dd1fe46a (diff)
downloadlinux-9ab99d5a43e9f283738fd9fd365539306d13eaac.tar.xz
Merge branch 'master' of /repos/git/net-next-2.6
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'arch/ia64/include/asm/acpi.h')
-rw-r--r--arch/ia64/include/asm/acpi.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index 91df9686a0da..7ae58892ba8d 100644
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -132,6 +132,12 @@ extern int __devinitdata pxm_to_nid_map[MAX_PXM_DOMAINS];
extern int __initdata nid_to_pxm_map[MAX_NUMNODES];
#endif
+static inline bool arch_has_acpi_pdc(void) { return true; }
+static inline void arch_acpi_set_pdc_bits(u32 *buf)
+{
+ buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP;
+}
+
#define acpi_unlazy_tlb(x)
#ifdef CONFIG_ACPI_NUMA