Patches contributed by Eötvös Lorand University
commit 275a88d3cf0e2f08a98dc5ce9494af0cb6ed2092
Merge: 52b8b8d7251f 9e81509efc4f
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Feb 16 09:45:33 2011 +0100
Merge branch 'x86/amd-nb' into x86/mm
Merge reason: consolidate it into the more generic x86/mm tree to prevent conflicts
with ongoing NUMA work.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 52b8b8d7251f8f7b8ed4a6c623618106d83e18b5
Merge: 02ac81a812fe 14392fd329ec
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Feb 16 09:44:04 2011 +0100
Merge branch 'x86/numa' into x86/mm
Merge reason: consolidate it into the more generic x86/mm tree to prevent conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc arch/x86/mm/amdtopology_64.c
index 49b334cdd64c,c7fae38c4080..2523c3554de5
--- a/arch/x86/mm/amdtopology_64.c
+++ b/arch/x86/mm/amdtopology_64.c
@@@ -282,12 -284,8 +282,12 @@@ int __init amd_scan_nodes(void
memblock_x86_register_active_regions(i,
nodes[i].start >> PAGE_SHIFT,
nodes[i].end >> PAGE_SHIFT);
+ init_memory_mapping_high();
+ for_each_node_mask(i, node_possible_map) {
+ int j;
+
for (j = apicid_base; j < cores + apicid_base; j++)
- apicid_to_node[(i << bits) + j] = i;
+ set_apicid_to_node((i << bits) + j, i);
setup_node_bootmem(i, nodes[i].start, nodes[i].end);
}
commit 02ac81a812fe0575a8475a93bdc22fb291ebad91
Merge: 9a6d44b9adb7 d2137d5af425
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Feb 16 09:42:50 2011 +0100
Merge branch 'x86/bootmem' into x86/mm
Merge reason: the topic is ready - consolidate it into the more generic x86/mm tree
and prevent conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit a252852afaea8270fcb91628b298253b112fc92e
Merge: d91309f69b7b d14dd7e20d5e
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Feb 15 04:10:35 2011 +0100
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
commit bf1af3a809506645b9130755b713b008da14737f
Merge: 0de4b34d466b 868baf07b1a2
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Feb 14 15:15:16 2011 +0100
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
commit b366801c95bdbeda811ac9668a3943051a18c188
Merge: eff9073790e1 100b33c8bd8a
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Feb 14 13:28:29 2011 +0100
Merge commit 'v2.6.38-rc4' into x86/numa
Merge reason: Merge latest fixes before applying new patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc arch/x86/include/asm/smp.h
index 75927822c5c8,1f4695136776..b296ca6f40bb
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@@ -38,15 -38,9 +38,12 @@@ static inline struct cpumask *cpu_core_
DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_apicid);
DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid);
+#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)
+DECLARE_EARLY_PER_CPU(int, x86_cpu_to_logical_apicid);
+#endif
/* Static state in head.S used to set up a CPU */
- extern struct {
- void *sp;
- unsigned short ss;
- } stack_start;
+ extern unsigned long stack_start; /* Initial stack pointer address */
struct smp_ops {
void (*smp_prepare_boot_cpu)(void);
commit 91e04ec05838a5b2c790decf2a91af98cb1666e8
Merge: 792363d2bece 100b33c8bd8a
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Feb 14 13:18:51 2011 +0100
Merge commit 'v2.6.38-rc4' into x86/cpu
Merge reason: pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit d2137d5af4259f50c19addb8246a186c9ffac325
Merge: f005fe12b90c 795abaf1e4e1
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Feb 14 11:55:18 2011 +0100
Merge branch 'linus' into x86/bootmem
Conflicts:
arch/x86/mm/numa_64.c
Merge reason: fix the conflict, update to latest -rc and pick up this
dependent fix from Yinghai:
e6d2e2b2b1e1: memblock: don't adjust size in memblock_find_base()
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc arch/x86/mm/numa_64.c
index 7cc26ae0a15d,95ea1551eebc..62cb634b5cf8
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@@ -590,13 -598,13 +598,14 @@@ static int __init numa_emulation(unsign
* the e820 memory map.
*/
remove_all_active_ranges();
- for_each_node_mask(i, node_possible_map) {
+ for_each_node_mask(i, node_possible_map)
memblock_x86_register_active_regions(i, nodes[i].start >> PAGE_SHIFT,
nodes[i].end >> PAGE_SHIFT);
+ init_memory_mapping_high();
+ for_each_node_mask(i, node_possible_map)
setup_node_bootmem(i, nodes[i].start, nodes[i].end);
- acpi_fake_nodes(nodes, num_nodes);
- }
+ setup_physnodes(addr, max_addr, acpi, amd);
+ fake_physnodes(acpi, amd, num_nodes);
numa_init_array();
return 0;
}
commit 40262a71536d0b4a7486b279fa39463cfffabcc2
Merge: 3e86858133c6 0849327d13a0
Author: Ingo Molnar <mingo@elte.hu>
Date: Sat Feb 12 02:24:52 2011 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 3e86858133c632060b290985837a11dbe2e0cc0e
Merge: d5e3d747007f 100b33c8bd8a
Author: Ingo Molnar <mingo@elte.hu>
Date: Sat Feb 12 02:24:23 2011 +0100
Merge commit 'v2.6.38-rc4' into perf/core
Merge reason: pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>