diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 12:00:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 12:00:14 +0100 |
| commit | 92bf73e90a35d40ebc1446488218f03833b36f86 (patch) | |
| tree | 8aaae58fcb7f3e06e63a5214f910acf47f4cc9d6 /arch/x86/include | |
| parent | 447557ac7ce120306b4a31d6003faef39cb1bf14 (diff) | |
| parent | 915b0d0104b72fd36af088ba4b11b5690bc96a6c (diff) | |
| download | op-kernel-dev-92bf73e90a35d40ebc1446488218f03833b36f86.zip op-kernel-dev-92bf73e90a35d40ebc1446488218f03833b36f86.tar.gz | |
Merge branch 'x86/irq' into perfcounters/core
( with manual semantic merge of arch/x86/kernel/cpu/perf_counter.c )
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/hardirq_32.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/hardirq_64.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/include/asm/hardirq_32.h b/arch/x86/include/asm/hardirq_32.h index b3e475d..7a07897 100644 --- a/arch/x86/include/asm/hardirq_32.h +++ b/arch/x86/include/asm/hardirq_32.h @@ -23,6 +23,8 @@ DECLARE_PER_CPU(irq_cpustat_t, irq_stat); #define __ARCH_IRQ_STAT #define __IRQ_STAT(cpu, member) (per_cpu(irq_stat, cpu).member) +#define inc_irq_stat(member) (__get_cpu_var(irq_stat).member++) + void ack_bad_irq(unsigned int irq); #include <linux/irq_cpustat.h> diff --git a/arch/x86/include/asm/hardirq_64.h b/arch/x86/include/asm/hardirq_64.h index 1ba381f..b5a6b5d 100644 --- a/arch/x86/include/asm/hardirq_64.h +++ b/arch/x86/include/asm/hardirq_64.h @@ -11,6 +11,8 @@ #define __ARCH_IRQ_STAT 1 +#define inc_irq_stat(member) add_pda(member, 1) + #define local_softirq_pending() read_pda(__softirq_pending) #define __ARCH_SET_SOFTIRQ_PENDING 1 |
