Skip to content
Commit af37501c authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
parents d859e29f 99937d64
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment