debuggers.hg

view xen/arch/ia64/patch/linux-2.6.11/linuxhardirq.h @ 4615:58efb3448933

bitkeeper revision 1.1327.1.1 (426536d2PUqtjTi2v06bzD10RFwarg)

Merge bk://xen.bkbits.net/xeno-unstable.bk
into bkbits.net:/repos/x/xen-ia64/xeno-unstable-ia64.bk
author xen-ia64.adm@bkbits.net
date Tue Apr 19 16:50:26 2005 +0000 (2005-04-19)
parents f1c946e1226a
children 5b9e241131fb
line source
1 hardirq.h | 6 ++++++
2 1 files changed, 6 insertions(+)
4 Index: linux-2.6.11-xendiffs/include/linux/hardirq.h
5 ===================================================================
6 --- linux-2.6.11-xendiffs.orig/include/linux/hardirq.h 2005-03-02 01:38:00.000000000 -0600
7 +++ linux-2.6.11-xendiffs/include/linux/hardirq.h 2005-03-25 08:49:57.301998663 -0600
8 @@ -2,7 +2,9 @@
9 #define LINUX_HARDIRQ_H
11 #include <linux/config.h>
12 +#ifndef XEN
13 #include <linux/smp_lock.h>
14 +#endif
15 #include <asm/hardirq.h>
16 #include <asm/system.h>
18 @@ -60,7 +62,11 @@
19 */
20 #define in_irq() (hardirq_count())
21 #define in_softirq() (softirq_count())
22 +#ifndef XEN
23 #define in_interrupt() (irq_count())
24 +#else
25 +#define in_interrupt() 0 // FIXME LATER
26 +#endif
28 #if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL)
29 # define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked())