From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 18 Jan 2009 17:15:49 +0000 (+0100)
Subject: Merge branch 'core/percpu' into perfcounters/core
X-Git-Tag: upstream/snapshot3+hdmi~18661^2~527
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af37501c792107c2bde1524bdae38d9a247b841a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

af37501c792107c2bde1524bdae38d9a247b841a
diff --cc arch/x86/include/asm/hardirq_64.h
index b5a6b5d,a65bab2..42930b2
--- a/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