Merge branch 'cpus4096' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-x86 into cpus4096

2026-09-26 18:16:26 +00:00 · 2009-03-13 05:54:55 +01:00 · 2009-03-13 05:54:55 +01:00 · 238a5b4bff
commit 238a5b4bff
parent 17d85bc756 73e907de7d
38 changed files with 246 additions and 336 deletions
--- a/arch/x86/include/asm/cpumask.h
+++ b/arch/x86/include/asm/cpumask.h
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
--- a/arch/x86/kernel/apic/nmi.c
+++ b/arch/x86/kernel/apic/nmi.c
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
--- a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
+++ b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
--- a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
--- a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
--- a/arch/x86/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
--- a/arch/x86/kernel/tlb_uv.c
+++ b/arch/x86/kernel/tlb_uv.c
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
--- a/arch/x86/oprofile/op_model_p4.c
+++ b/arch/x86/oprofile/op_model_p4.c
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
--- a/block/blk.h
+++ b/block/blk.h
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
--- a/drivers/xen/cpu_hotplug.c
+++ b/drivers/xen/cpu_hotplug.c
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
--- a/mm/quicklist.c
+++ b/mm/quicklist.c
--- a/mm/slab.c
+++ b/mm/slab.c
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c