diff options
-rw-r--r-- | arch/x86/Kconfig | 4 | ||||
-rw-r--r-- | arch/x86/mm/discontig_32.c | 17 |
2 files changed, 0 insertions, 21 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 67e5275f03c8..d8dddbc5e349 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -460,10 +460,6 @@ config ACPI_SRAT | |||
460 | depends on X86_32 && ACPI && NUMA && X86_GENERICARCH | 460 | depends on X86_32 && ACPI && NUMA && X86_GENERICARCH |
461 | select ACPI_NUMA | 461 | select ACPI_NUMA |
462 | 462 | ||
463 | config HAVE_ARCH_PARSE_SRAT | ||
464 | def_bool y | ||
465 | depends on ACPI_SRAT | ||
466 | |||
467 | config X86_SUMMIT_NUMA | 463 | config X86_SUMMIT_NUMA |
468 | def_bool y | 464 | def_bool y |
469 | depends on X86_32 && NUMA && X86_GENERICARCH | 465 | depends on X86_32 && NUMA && X86_GENERICARCH |
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c index fa389d20383e..5dfef9fa061a 100644 --- a/arch/x86/mm/discontig_32.c +++ b/arch/x86/mm/discontig_32.c | |||
@@ -443,20 +443,3 @@ int memory_add_physaddr_to_nid(u64 addr) | |||
443 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); | 443 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); |
444 | #endif | 444 | #endif |
445 | 445 | ||
446 | #if defined(CONFIG_ACPI_NUMA) && !defined(CONFIG_HAVE_ARCH_PARSE_SRAT) | ||
447 | /* | ||
448 | * Dummy on 32-bit, for now: | ||
449 | */ | ||
450 | void __init acpi_numa_slit_init(struct acpi_table_slit *slit) | ||
451 | { | ||
452 | } | ||
453 | |||
454 | void __init | ||
455 | acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) | ||
456 | { | ||
457 | } | ||
458 | |||
459 | void __init acpi_numa_arch_fixup(void) | ||
460 | { | ||
461 | } | ||
462 | #endif | ||