| commit | 3eb3963fd1974c63e9bb3cfe774abc3e1995e479 | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Wed, 21 Jan 2009 09:14:17 +0000 (21 10:14 +0100) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Wed, 21 Jan 2009 09:14:17 +0000 (21 10:14 +0100) | ||
| tree | c00d6c2e8484793ab6bd0644db59bbdf5e9429c5 | treesnapshot (tar.gz zip) |
| parent | ae2b56b92bd33b416528986528e0732c98c7a285 | commitdiff |
| parent | 5766b842b23c6b40935a5f3bd435b2bcdaff2143 | commitdiff |
Merge branch 'cpus4096' into core/percpu
Conflicts:
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/x86/kernel/tlb_32.c
Merge it here because both the cpumask changes and the ongoing percpu
work is touching the TLB code. The percpu changes take precedence, as
they eliminate tlb_32.c altogether.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Conflicts:
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/x86/kernel/tlb_32.c
Merge it here because both the cpumask changes and the ongoing percpu
work is touching the TLB code. The percpu changes take precedence, as
they eliminate tlb_32.c altogether.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| arch/x86/include/asm/topology.h | diff1 | diff2 | blobhistory |
| arch/x86/kernel/apic.c | diff1 | diff2 | blobhistory |