| commit | af37501c792107c2bde1524bdae38d9a247b841a | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sun Jan 18 18:15:49 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Sun Jan 18 18:15:49 2009 +0100 |
| tree | b50ee90d29e72956b8b7d8d19677fe5996755d49 | |
| parent | d859e29fe34cb833071b20aef860ee94fbad9bb2 [diff] | |
| parent | 99937d6455cea95405ac681c86a857d0fcd530bd [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>