git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
linux
/
hardirq.h
diff --git
a/include/linux/hardirq.h
b/include/linux/hardirq.h
index
50d8b57
..
eab5370
100644
(file)
--- a/
include/linux/hardirq.h
+++ b/
include/linux/hardirq.h
@@
-1,9
+1,9
@@
#ifndef LINUX_HARDIRQ_H
#define LINUX_HARDIRQ_H
#ifndef LINUX_HARDIRQ_H
#define LINUX_HARDIRQ_H
+#include <linux/config.h>
#include <linux/preempt.h>
#include <linux/smp_lock.h>
#include <linux/preempt.h>
#include <linux/smp_lock.h>
-#include <linux/lockdep.h>
#include <asm/hardirq.h>
#include <asm/system.h>
#include <asm/hardirq.h>
#include <asm/system.h>
@@
-87,6
+87,9
@@
extern void synchronize_irq(unsigned int irq);
# define synchronize_irq(irq) barrier()
#endif
# define synchronize_irq(irq) barrier()
#endif
+#define nmi_enter() irq_enter()
+#define nmi_exit() sub_preempt_count(HARDIRQ_OFFSET)
+
struct task_struct;
#ifndef CONFIG_VIRT_CPU_ACCOUNTING
struct task_struct;
#ifndef CONFIG_VIRT_CPU_ACCOUNTING
@@
-95,35
+98,12
@@
static inline void account_system_vtime(struct task_struct *tsk)
}
#endif
}
#endif
-/*
- * It is safe to do non-atomic ops on ->hardirq_context,
- * because NMI handlers may not preempt and the ops are
- * always balanced, so the interrupted value of ->hardirq_context
- * will always be restored.
- */
#define irq_enter() \
do { \
account_system_vtime(current); \
add_preempt_count(HARDIRQ_OFFSET); \
#define irq_enter() \
do { \
account_system_vtime(current); \
add_preempt_count(HARDIRQ_OFFSET); \
- trace_hardirq_enter(); \
- } while (0)
-
-/*
- * Exit irq context without processing softirqs:
- */
-#define __irq_exit() \
- do { \
- trace_hardirq_exit(); \
- account_system_vtime(current); \
- sub_preempt_count(HARDIRQ_OFFSET); \
} while (0)
} while (0)
-/*
- * Exit irq context and process softirqs if needed:
- */
extern void irq_exit(void);
extern void irq_exit(void);
-#define nmi_enter() do { lockdep_off(); irq_enter(); } while (0)
-#define nmi_exit() do { __irq_exit(); lockdep_on(); } while (0)
-
#endif /* LINUX_HARDIRQ_H */
#endif /* LINUX_HARDIRQ_H */