Merge branch 'core/percpu' into perfcounters/core

Conflicts: arch/x86/include/asm/hardirq_32.h arch/x86/include/asm/hardirq_64.h Semantic merge: arch/x86/include/asm/hardirq.h [ added apic_perf_irqs field. ] Signed-off-by: Ingo Molnar <mingo@elte.hu>
2026-10-16 22:39:48 +00:00 · 2009-01-23 10:20:15 +01:00 · 2009-01-23 10:20:15 +01:00 · bfe2a3c3b5
commit bfe2a3c3b5
parent 77835492ed 35d266a247
74 changed files with 1137 additions and 1294 deletions
--- a/arch/ia64/include/asm/topology.h
+++ b/arch/ia64/include/asm/topology.h
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
--- a/arch/x86/include/asm/genapic_32.h
+++ b/arch/x86/include/asm/genapic_32.h
--- a/arch/x86/include/asm/genapic_64.h
+++ b/arch/x86/include/asm/genapic_64.h
--- a/arch/x86/include/asm/hardirq.h
+++ b/arch/x86/include/asm/hardirq.h
--- a/arch/x86/include/asm/hardirq_32.h
+++ b/arch/x86/include/asm/hardirq_32.h
--- a/arch/x86/include/asm/hardirq_64.h
+++ b/arch/x86/include/asm/hardirq_64.h
--- a/arch/x86/include/asm/irq_regs.h
+++ b/arch/x86/include/asm/irq_regs.h
--- a/arch/x86/include/asm/irq_regs_32.h
+++ b/arch/x86/include/asm/irq_regs_32.h
--- a/arch/x86/include/asm/irq_regs_64.h
+++ b/arch/x86/include/asm/irq_regs_64.h
--- a/arch/x86/include/asm/irq_vectors.h
+++ b/arch/x86/include/asm/irq_vectors.h
--- a/arch/x86/include/asm/mach-default/entry_arch.h
+++ b/arch/x86/include/asm/mach-default/entry_arch.h
--- a/arch/x86/include/asm/mmu_context.h
+++ b/arch/x86/include/asm/mmu_context.h
--- a/arch/x86/include/asm/mmu_context_32.h
+++ b/arch/x86/include/asm/mmu_context_32.h
--- a/arch/x86/include/asm/mmu_context_64.h
+++ b/arch/x86/include/asm/mmu_context_64.h
--- a/arch/x86/include/asm/pda.h
+++ b/arch/x86/include/asm/pda.h
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.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/stackprotector.h
+++ b/arch/x86/include/asm/stackprotector.h
--- a/arch/x86/include/asm/system.h
+++ b/arch/x86/include/asm/system.h
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
--- a/arch/x86/include/asm/uv/uv.h
+++ b/arch/x86/include/asm/uv/uv.h
--- a/arch/x86/include/asm/uv/uv_bau.h
+++ b/arch/x86/include/asm/uv/uv_bau.h
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
--- a/arch/x86/kernel/asm-offsets_64.c
+++ b/arch/x86/kernel/asm-offsets_64.c
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.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/efi.c
+++ b/arch/x86/kernel/efi.c
--- a/arch/x86/kernel/efi_64.c
+++ b/arch/x86/kernel/efi_64.c
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
--- a/arch/x86/kernel/genapic_64.c
+++ b/arch/x86/kernel/genapic_64.c
--- a/arch/x86/kernel/genx2apic_uv_x.c
+++ b/arch/x86/kernel/genx2apic_uv_x.c
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
--- a/arch/x86/kernel/irq_64.c
+++ b/arch/x86/kernel/irq_64.c
--- a/arch/x86/kernel/irqinit_32.c
+++ b/arch/x86/kernel/irqinit_32.c
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
--- a/arch/x86/kernel/tlb_32.c
+++ b/arch/x86/kernel/tlb_32.c
--- a/arch/x86/kernel/tlb_uv.c
+++ b/arch/x86/kernel/tlb_uv.c
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
--- a/arch/x86/kernel/vmlinux_64.lds.S
+++ b/arch/x86/kernel/vmlinux_64.lds.S
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
--- a/arch/x86/kernel/tlb_64.c
+++ b/arch/x86/kernel/tlb_64.c
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
--- a/drivers/misc/sgi-gru/gru.h
+++ b/drivers/misc/sgi-gru/gru.h
--- a/drivers/misc/sgi-xp/xp.h
+++ b/drivers/misc/sgi-xp/xp.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/stackprotector.h
+++ b/include/linux/stackprotector.h
--- a/init/main.c
+++ b/init/main.c
--- a/kernel/exit.c
+++ b/kernel/exit.c
--- a/kernel/fork.c
+++ b/kernel/fork.c
--- a/kernel/panic.c
+++ b/kernel/panic.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c