diff options
| author | Brian Gerst <brgerst@gmail.com> | 2009-01-23 03:03:31 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-01-23 03:03:31 +0100 |
| commit | 22da7b3df3a2e26a87a8581575dbf26e465a6ac7 (patch) | |
| tree | ea6e5000ebb91951b5613bc818d683cdc21af75a /arch/x86/include/asm/hardirq_32.h | |
| parent | x86: sync hardirq_{32,64}.h (diff) | |
| download | linux-22da7b3df3a2e26a87a8581575dbf26e465a6ac7.tar.xz linux-22da7b3df3a2e26a87a8581575dbf26e465a6ac7.zip | |
x86: merge hardirq_{32,64}.h into hardirq.h
Impact: cleanup
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/hardirq_32.h')
| -rw-r--r-- | arch/x86/include/asm/hardirq_32.h | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/arch/x86/include/asm/hardirq_32.h b/arch/x86/include/asm/hardirq_32.h deleted file mode 100644 index e5a332c28c98..000000000000 --- a/arch/x86/include/asm/hardirq_32.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef _ASM_X86_HARDIRQ_32_H -#define _ASM_X86_HARDIRQ_32_H - -#include <linux/threads.h> -#include <linux/irq.h> - -typedef struct { - unsigned int __softirq_pending; - unsigned int __nmi_count; /* arch dependent */ - unsigned int apic_timer_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 - -#define __ARCH_IRQ_STAT - -#define inc_irq_stat(member) percpu_add(irq_stat.member, 1) - -#define local_softirq_pending() percpu_read(irq_stat.__softirq_pending) - -#define __ARCH_SET_SOFTIRQ_PENDING - -#define set_softirq_pending(x) percpu_write(irq_stat.__softirq_pending, (x)) -#define or_softirq_pending(x) percpu_or(irq_stat.__softirq_pending, (x)) - -extern void ack_bad_irq(unsigned int irq); - -#endif /* _ASM_X86_HARDIRQ_32_H */ |