diff for duplicates of <4CDF3DA1.2090806@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 603ce4b..8acbc78 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ But SRAT table still old order, it will list cpus in one socket all together. If the user have compiled limited NR_CPUS or boot with nr_cpus=, could have missed to put some cpus apic id to node mapping into apicid_to_node[]. -for example for 4 sockets system with 64 cpus with nr_cpus2 will get crash... +for example for 4 sockets system with 64 cpus with nr_cpus=32 will get crash... [ 9.106288] Total of 32 processors activated (136190.88 BogoMIPS). [ 9.235021] divide error: 0000 [#1] SMP @@ -58,7 +58,7 @@ Also add apicid checking with MAX_LOCAL_APIC, in case We could out of boundaries apicid_to_node[]. it should fix following bug too. -https://bugzilla.kernel.org/show_bug.cgi?id"662 +https://bugzilla.kernel.org/show_bug.cgi?id=22662 Reported-and-Tested-by: Wu Fengguang <fengguang.wu@intel.com> Reported-by: Bjorn Helgaas <bjorn.helgaas@hp.com> @@ -71,7 +71,8 @@ Signed-off-by: Yinghai Lu <yinghai@kernel.org> 3 files changed, 27 insertions(+), 2 deletions(-) Index: linux-2.6/arch/x86/kernel/acpi/boot.c -=================================--- linux-2.6.orig/arch/x86/kernel/acpi/boot.c +=================================================================== +--- linux-2.6.orig/arch/x86/kernel/acpi/boot.c +++ linux-2.6/arch/x86/kernel/acpi/boot.c @@ -198,6 +198,13 @@ static void __cpuinit acpi_register_lapi { @@ -88,7 +89,8 @@ Index: linux-2.6/arch/x86/kernel/acpi/boot.c ++disabled_cpus; return; Index: linux-2.6/arch/x86/mm/srat_64.c -=================================--- linux-2.6.orig/arch/x86/mm/srat_64.c +=================================================================== +--- linux-2.6.orig/arch/x86/mm/srat_64.c +++ linux-2.6/arch/x86/mm/srat_64.c @@ -134,6 +134,10 @@ acpi_numa_x2apic_affinity_init(struct ac } @@ -113,7 +115,8 @@ Index: linux-2.6/arch/x86/mm/srat_64.c node_set(node, cpu_nodes_parsed); acpi_numa = 1; Index: linux-2.6/drivers/acpi/numa.c -=================================--- linux-2.6.orig/drivers/acpi/numa.c +=================================================================== +--- linux-2.6.orig/drivers/acpi/numa.c +++ linux-2.6/drivers/acpi/numa.c @@ -275,13 +275,23 @@ acpi_table_parse_srat(enum acpi_srat_typ int __init acpi_numa_init(void) diff --git a/a/content_digest b/N1/content_digest index 92cf03a..4c797c5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,8 +10,8 @@ "ref\04CDEE314.6090107@kernel.org\0" "ref\020101113235746.GA9458@localhost\0" "From\0Yinghai Lu <yinghai@kernel.org>\0" - "Subject\0[PATCH] x86, acpi: Handle all SRAT cpu entries even have cpu num\0" - "Date\0Sun, 14 Nov 2010 01:38:41 +0000\0" + "Subject\0[PATCH] x86, acpi: Handle all SRAT cpu entries even have cpu num limitation\0" + "Date\0Sat, 13 Nov 2010 17:38:41 -0800\0" "To\0Ingo Molnar <mingo@elte.hu>" Andrew Morton <akpm@linux-foundation.org> Thomas Gleixner <tglx@linutronix.de> @@ -39,7 +39,7 @@ "If the user have compiled limited NR_CPUS or boot with nr_cpus=, could have missed\n" "to put some cpus apic id to node mapping into apicid_to_node[].\n" "\n" - "for example for 4 sockets system with 64 cpus with nr_cpus2 will get crash...\n" + "for example for 4 sockets system with 64 cpus with nr_cpus=32 will get crash...\n" "\n" "[ 9.106288] Total of 32 processors activated (136190.88 BogoMIPS).\n" "[ 9.235021] divide error: 0000 [#1] SMP \n" @@ -91,7 +91,7 @@ "apicid_to_node[].\n" "\n" "it should fix following bug too.\n" - "https://bugzilla.kernel.org/show_bug.cgi?id\"662\n" + "https://bugzilla.kernel.org/show_bug.cgi?id=22662\n" "\n" "Reported-and-Tested-by: Wu Fengguang <fengguang.wu@intel.com>\n" "Reported-by: Bjorn Helgaas <bjorn.helgaas@hp.com>\n" @@ -104,7 +104,8 @@ " 3 files changed, 27 insertions(+), 2 deletions(-)\n" "\n" "Index: linux-2.6/arch/x86/kernel/acpi/boot.c\n" - "=================================--- linux-2.6.orig/arch/x86/kernel/acpi/boot.c\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/kernel/acpi/boot.c\n" "+++ linux-2.6/arch/x86/kernel/acpi/boot.c\n" "@@ -198,6 +198,13 @@ static void __cpuinit acpi_register_lapi\n" " {\n" @@ -121,7 +122,8 @@ " \t\t++disabled_cpus;\n" " \t\treturn;\n" "Index: linux-2.6/arch/x86/mm/srat_64.c\n" - "=================================--- linux-2.6.orig/arch/x86/mm/srat_64.c\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/mm/srat_64.c\n" "+++ linux-2.6/arch/x86/mm/srat_64.c\n" "@@ -134,6 +134,10 @@ acpi_numa_x2apic_affinity_init(struct ac\n" " \t}\n" @@ -146,7 +148,8 @@ " \tnode_set(node, cpu_nodes_parsed);\n" " \tacpi_numa = 1;\n" "Index: linux-2.6/drivers/acpi/numa.c\n" - "=================================--- linux-2.6.orig/drivers/acpi/numa.c\n" + "===================================================================\n" + "--- linux-2.6.orig/drivers/acpi/numa.c\n" "+++ linux-2.6/drivers/acpi/numa.c\n" "@@ -275,13 +275,23 @@ acpi_table_parse_srat(enum acpi_srat_typ\n" " int __init acpi_numa_init(void)\n" @@ -175,4 +178,4 @@ " \t\t\t\t\t acpi_parse_memory_affinity,\n" " \t\t\t\t\t NR_NODE_MEMBLKS);" -9eb8c2536355dd6a2496c06588ec6e6dd08e0732d7cccdb395bf460df26e7542 +1a0cfb6a4fcc05899c5ce329b9961d798d15d59a558138c3f40b29fbc4bcb133
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.