The patch titled acpi: remove have_arch_parse_srat in acpi.h has been added to the -mm tree. Its filename is acpi-remove-have_arch_parse_srat-in-acpih.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: acpi: remove have_arch_parse_srat in acpi.h From: Yinghai Lu <yhlu.kernel@xxxxxxxxx> This was a workaround for 32bit numa SRAT processing, and we removed those workarounds, making 32 bit more like 64 bit. HAVE_ARCH_PARSE_SRAT is no longer defined anywhere. Signed-off-by: Yinghai Lu <yhlu.kernel@xxxxxxxxx> Cc: Bjorn Helgaas <bjorn.helgaas@xxxxxx> Cc: Len Brown <lenb@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/acpi.h | 8 -------- 1 file changed, 8 deletions(-) diff -puN include/linux/acpi.h~acpi-remove-have_arch_parse_srat-in-acpih include/linux/acpi.h --- a/include/linux/acpi.h~acpi-remove-have_arch_parse_srat-in-acpih +++ a/include/linux/acpi.h @@ -95,18 +95,10 @@ int acpi_parse_mcfg (struct acpi_table_h 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 */ _ Patches currently in -mm which might be from yhlu.kernel@xxxxxxxxx are git-tip.patch git-pci.patch acpi-dont-load-acpi_cpufreq-if-acpi=off.patch acpi-remove-have_arch_parse_srat-in-acpih.patch arch-x86-kernel-early_printkc-remove-unused-enable_debug_console.patch mm-print-out-meminit-for-memmap.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html