diff options
author | Len Brown <len.brown@intel.com> | 2008-10-22 23:35:56 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:35:56 -0400 |
commit | 1b79b27da172d6c868746135feeb71de4ddd0646 (patch) | |
tree | 567ab66f1a60e322d161e0e44bdf48cb13e55c66 /include | |
parent | 7674416db4ee3d43813dddb650364ca994755256 (diff) | |
parent | fa89b6089b5f4c7a5244b642caaca3e72b06ebe4 (diff) |
Merge branch 'yinghai' into test
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/acpi.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 702f79dad16a..fd6a452b0ceb 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -94,18 +94,10 @@ int acpi_parse_mcfg (struct acpi_table_header *header); void acpi_table_print_madt_entry (struct acpi_subtable_header *madt); /* the following four functions are architecture-dependent */ -#ifdef CONFIG_HAVE_ARCH_PARSE_SRAT -#define NR_NODE_MEMBLKS MAX_NUMNODES -#define acpi_numa_slit_init(slit) do {} while (0) -#define acpi_numa_processor_affinity_init(pa) do {} while (0) -#define acpi_numa_memory_affinity_init(ma) do {} while (0) -#define acpi_numa_arch_fixup() do {} while (0) -#else void acpi_numa_slit_init (struct acpi_table_slit *slit); void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa); void acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma); void acpi_numa_arch_fixup(void); -#endif #ifdef CONFIG_ACPI_HOTPLUG_CPU /* Arch dependent functions for cpu hotplug support */ |