diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 11:59:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 11:59:23 +0200 |
| commit | 2b4fa851b2f06fdb04cac808b57324f5e51e1578 (patch) | |
| tree | 97db3ad5adda7683923630982f68b8b52c86e790 /arch/x86/mm/srat_64.c | |
| parent | Merge branch 'x86/mpparse' into x86/devel (diff) | |
| parent | x86: use reserve_bootmem_generic() to reserve crashkernel memory on x86_64 (diff) | |
| download | linux-2b4fa851b2f06fdb04cac808b57324f5e51e1578.tar.xz linux-2b4fa851b2f06fdb04cac808b57324f5e51e1578.zip | |
Merge branch 'x86/numa' into x86/devel
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/e820.c
arch/x86/kernel/efi_64.c
arch/x86/kernel/mpparse.c
arch/x86/kernel/setup.c
arch/x86/kernel/setup_32.c
arch/x86/mm/init_64.c
include/asm-x86/proto.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/srat_64.c')
| -rw-r--r-- | arch/x86/mm/srat_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 391d51035871..b67f5a16755f 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c @@ -376,7 +376,7 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end) if (node == NUMA_NO_NODE) continue; if (!node_isset(node, node_possible_map)) - numa_set_node(i, NUMA_NO_NODE); + numa_clear_node(i); } numa_init_array(); return 0; |