projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d859e29 99937d6)
Merge branch 'core/percpu' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Sun, 18 Jan 2009 17:15:49 +0000 (18:15 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 18 Jan 2009 17:15:49 +0000 (18:15 +0100)
commitaf37501c792107c2bde1524bdae38d9a247b841a
treeb50ee90d29e72956b8b7d8d19677fe5996755d49tree | snapshot
parentd859e29fe34cb833071b20aef860ee94fbad9bb2commit | diff
parent99937d6455cea95405ac681c86a857d0fcd530bdcommit | diff
Merge branch 'core/percpu' into perfcounters/core

Conflicts:
arch/x86/include/asm/pda.h

We merge tip/core/percpu into tip/perfcounters/core because of a
semantic and contextual conflict: the former eliminates the PDA,
while the latter extends it with apic_perf_irqs field.

Resolve the conflict by moving the new field to the irq_cpustat
structure on 64-bit too.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
12 files changed:
arch/powerpc/kernel/irq.c diff1 | diff2 | blob | history
arch/x86/ia32/ia32entry.S diff1 | diff2 | blob | history
arch/x86/include/asm/hardirq_32.h diff1 | diff2 | blob | history
arch/x86/include/asm/hardirq_64.h diff1 | diff2 | blob | history
arch/x86/include/asm/irq_vectors.h diff1 | diff2 | blob | history
arch/x86/include/asm/thread_info.h diff1 | diff2 | blob | history
arch/x86/kernel/apic.c diff1 | diff2 | blob | history
arch/x86/kernel/cpu/common.c diff1 | diff2 | blob | history
arch/x86/kernel/entry_64.S diff1 | diff2 | blob | history
arch/x86/kernel/irq.c diff1 | diff2 | blob | history
kernel/Makefile diff1 | diff2 | blob | history
kernel/sched.c diff1 | diff2 | blob | history
Making Linux better for my computers