aboutsummaryrefslogtreecommitdiffstats
path: root/xen/include/asm-x86/hardirq.h
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-02-14 18:25:10 +0100
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-02-14 18:25:10 +0100
commitf25330e8694f5507e6b922641ef553303a3c0976 (patch)
treee81871c84505808023dc3fe2e922514cf5aa2d9e /xen/include/asm-x86/hardirq.h
parent193af2f5c726788dd836c42561550029eadd7ce6 (diff)
downloadxen-f25330e8694f5507e6b922641ef553303a3c0976.tar.gz
xen-f25330e8694f5507e6b922641ef553303a3c0976.tar.bz2
xen-f25330e8694f5507e6b922641ef553303a3c0976.zip
More upgrades of Xen code to linux-2.6.16-rc2.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/include/asm-x86/hardirq.h')
-rw-r--r--xen/include/asm-x86/hardirq.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/xen/include/asm-x86/hardirq.h b/xen/include/asm-x86/hardirq.h
index 04fa38b4be..59e90e2b47 100644
--- a/xen/include/asm-x86/hardirq.h
+++ b/xen/include/asm-x86/hardirq.h
@@ -15,7 +15,12 @@ typedef struct {
#define in_irq() (local_irq_count(smp_processor_id()) != 0)
-#define irq_enter(cpu) (local_irq_count(cpu)++)
-#define irq_exit(cpu) (local_irq_count(cpu)--)
+#define irq_enter() (local_irq_count(smp_processor_id())++)
+#define irq_exit() (local_irq_count(smp_processor_id())--)
+
+void ack_bad_irq(unsigned int irq);
+
+extern void apic_intr_init(void);
+extern void smp_intr_init(void);
#endif /* __ASM_HARDIRQ_H */