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>

diff --cc arch/powerpc/kernel/irq.c
Simple merge

diff --cc arch/x86/ia32/ia32entry.S
Simple merge

diff --cc arch/x86/include/asm/hardirq_32.h
Simple merge

diff --cc arch/x86/include/asm/hardirq_64.h
index b5a6b5d56704c89330d2f88f515c5d25281e105f,a65bab20f6ce5cbe737dd365407ddaff518e559c..42930b2792155014162ad82768bc9789d410dab6
--- 1/arch/x86/include/asm/hardirq_64.h
--- 2/arch/x86/include/asm/hardirq_64.h
+++ b/arch/x86/include/asm/hardirq_64.h
@@@ -3,9 -3,23 +3,24 @@@
  
  #include <linux/threads.h>
  #include <linux/irq.h>
- #include <asm/pda.h>
  #include <asm/apic.h>
  
+ typedef struct {
+       unsigned int __softirq_pending;
+       unsigned int __nmi_count;       /* arch dependent */
+       unsigned int apic_timer_irqs;   /* arch dependent */
++      unsigned int apic_perf_irqs;    /* arch dependent */
+       unsigned int irq0_irqs;
+       unsigned int irq_resched_count;
+       unsigned int irq_call_count;
+       unsigned int irq_tlb_count;
+       unsigned int irq_thermal_count;
+       unsigned int irq_spurious_count;
+       unsigned int irq_threshold_count;
+ } ____cacheline_aligned irq_cpustat_t;
+ 
+ DECLARE_PER_CPU(irq_cpustat_t, irq_stat);
+ 
  /* We can have at most NR_VECTORS irqs routed to a cpu at a time */
  #define MAX_HARDIRQS_PER_CPU NR_VECTORS
  

diff --cc arch/x86/include/asm/irq_vectors.h
Simple merge

diff --cc arch/x86/include/asm/thread_info.h
Simple merge

diff --cc arch/x86/kernel/apic.c
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kernel/irq.c
Simple merge

diff --cc kernel/Makefile
Simple merge

diff --cc kernel/sched.c
Simple merge