diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /arch/ia64/include/asm/acpi.h | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/ia64/include/asm/acpi.h')
| -rw-r--r-- | arch/ia64/include/asm/acpi.h | 6 |
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]; | |||
| 132 | extern int __initdata nid_to_pxm_map[MAX_NUMNODES]; | 132 | extern int __initdata nid_to_pxm_map[MAX_NUMNODES]; |
| 133 | #endif | 133 | #endif |
| 134 | 134 | ||
| 135 | static inline bool arch_has_acpi_pdc(void) { return true; } | ||
| 136 | static inline void arch_acpi_set_pdc_bits(u32 *buf) | ||
| 137 | { | ||
| 138 | buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP; | ||
| 139 | } | ||
| 140 | |||
| 135 | #define acpi_unlazy_tlb(x) | 141 | #define acpi_unlazy_tlb(x) |
| 136 | 142 | ||
| 137 | #ifdef CONFIG_ACPI_NUMA | 143 | #ifdef CONFIG_ACPI_NUMA |