af37501c79
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> |
||
|---|---|---|
| .. | ||
| audit.c | ||
| ia32_aout.c | ||
| ia32_signal.c | ||
| ia32entry.S | ||
| ipc32.c | ||
| Makefile | ||
| sys_ia32.c | ||