x86: reduce memory and intra-node effects

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index f9919c492699ebd163cc76a93bb11a4517f6f113..85bd3d463cdfe5c9801adf2ebc1fdfea6f2f6144 100644 (file)
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -1175,14 +1175,15 @@ __cpuinit int apic_is_clustered_box(void)
 {
        int i, clusters, zeros;
        unsigned id;
+       u16 *bios_cpu_apicid = x86_bios_cpu_apicid_early_ptr;
        DECLARE_BITMAP(clustermap, NUM_APIC_CLUSTERS);
 
        bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
 
        for (i = 0; i < NR_CPUS; i++) {
                /* are we being called early in kernel startup? */
-               if (x86_bios_cpu_apicid_early_ptr) {
-                       id = ((u16 *)x86_bios_cpu_apicid_early_ptr)[i];
+               if (bios_cpu_apicid) {
+                       id = bios_cpu_apicid[i];
                }
                else if (i < nr_cpu_ids) {
                        if (cpu_present(i))

diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index fd671754dcb5a08a83122bd5b023b9ad4363c545..d3260f8f17dce8a08acd58c2f53b89891f433058 100644 (file)
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -122,7 +122,7 @@ static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
        physid_set(m->mpc_apicid, phys_cpu_present_map);
        if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) {
                /*
-                * x86_bios_cpu_apicid is required to have processors listed
+                * x86_bios_cpu_apicid is required to have processors listed
                 * in same order as logical cpu numbers. Hence the first
                 * entry is BSP, and so on.
                 */
@@ -130,8 +130,8 @@ static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
        }
        /* are we being called early in kernel startup? */
        if (x86_cpu_to_apicid_early_ptr) {
-               u16 *cpu_to_apicid = (u16 *)x86_cpu_to_apicid_early_ptr;
-               u16 *bios_cpu_apicid = (u16 *)x86_bios_cpu_apicid_early_ptr;
+               u16 *cpu_to_apicid = x86_cpu_to_apicid_early_ptr;
+               u16 *bios_cpu_apicid = x86_bios_cpu_apicid_early_ptr;
 
                cpu_to_apicid[cpu] = m->mpc_apicid;
                bios_cpu_apicid[cpu] = m->mpc_apicid;

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 382377d6421dc667d8e1648d624707518160cd32..dca58fb39b086b807cb59f3c8dc1c03c96146eb8 100644 (file)
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -562,7 +562,7 @@ __cpuinit void numa_add_cpu(int cpu)
 
 void __cpuinit numa_set_node(int cpu, int node)
 {
-       u16 *cpu_to_node_map = (u16 *)x86_cpu_to_node_map_early_ptr;
+       u16 *cpu_to_node_map = x86_cpu_to_node_map_early_ptr;
 
        cpu_pda(cpu)->nodenumber = node;
 

diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
index bccbdc7be434c328677873b96e260d9c4c982cdd..e5a1ec8342dc8d52da8452a96639782008a21d12 100644 (file)
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@ -346,8 +346,12 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end)
        /* First clean up the node list */
        for (i = 0; i < MAX_NUMNODES; i++) {
                cutoff_node(i, start, end);
-               /* ZZZ why was this needed. At least add a comment */
-               if (nodes[i].end && (nodes[i].end - nodes[i].start) < NODE_MIN_SIZE) {
+               /*
+                * don't confuse VM with a node that doesn't have the
+                * minimum memory.
+                */
+               if (nodes[i].end &&
+                       (nodes[i].end - nodes[i].start) < NODE_MIN_SIZE) {
                        unparse_node(i);
                        node_set_offline(i);
                }

diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h
index e612ed8d2bc74b147edd4bbd330cfb9a4afb02f5..a89b46eb2526add44c9da05c75b72700d7b6a8a7 100644 (file)
--- a/include/asm-x86/topology.h
+++ b/include/asm-x86/topology.h
@@ -40,7 +40,7 @@ extern cpumask_t node_to_cpumask_map[];
 /* Returns the number of the node containing CPU 'cpu' */
 static inline int cpu_to_node(int cpu)
 {
-       u16 *cpu_to_node_map = (u16 *)x86_cpu_to_node_map_early_ptr;
+       u16 *cpu_to_node_map = x86_cpu_to_node_map_early_ptr;
 
        if (cpu_to_node_map)
                return cpu_to_node_map[cpu];