From c2cb81f2d197e129795b2455fea7e35fbd844d6f Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Wed, 24 Sep 2008 19:04:32 -0700 Subject: [PATCH] --- yaml --- r: 117403 b: refs/heads/master c: fa89b6089b5f4c7a5244b642caaca3e72b06ebe4 h: refs/heads/master i: 117401: fb804abaf885d059ba07d7a6f055f4741cfd475c 117399: 80bbfed3441962a7fcee8b0c930c8667dd4cbfad v: v3 --- [refs] | 2 +- trunk/include/linux/acpi.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 9d397ddec633..1f5a6cb5237d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee297533279a802eac8b1cbea8e65b24b36a1aac +refs/heads/master: fa89b6089b5f4c7a5244b642caaca3e72b06ebe4 diff --git a/trunk/include/linux/acpi.h b/trunk/include/linux/acpi.h index 702f79dad16a..fd6a452b0ceb 100644 --- a/trunk/include/linux/acpi.h +++ b/trunk/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 */