summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/hardirq_64.h
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2009-01-23 11:03:31 +0900
committerTejun Heo <tj@kernel.org>2009-01-23 11:03:31 +0900
commit22da7b3df3a2e26a87a8581575dbf26e465a6ac7 (patch)
treeea6e5000ebb91951b5613bc818d683cdc21af75a /arch/x86/include/asm/hardirq_64.h
parent658a9a2c34914e8114eea9c4d85d4ecd3ee33b98 (diff)
downloadlinux-22da7b3df3a2e26a87a8581575dbf26e465a6ac7.tar.bz2
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_64.h')
-rw-r--r--arch/x86/include/asm/hardirq_64.h38
1 files changed, 0 insertions, 38 deletions
diff --git a/arch/x86/include/asm/hardirq_64.h b/arch/x86/include/asm/hardirq_64.h
deleted file mode 100644
index 392e7d614579..000000000000
--- a/arch/x86/include/asm/hardirq_64.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _ASM_X86_HARDIRQ_64_H
-#define _ASM_X86_HARDIRQ_64_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_64_H */