diff options
| author | Ingo Molnar <mingo@elte.hu> | 2006-07-03 03:25:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 18:27:09 -0400 |
| commit | 366c7f554e888e51b8395f9b07b273fe775c7ff3 (patch) | |
| tree | 324fab660758f1c5be4585ca2fcdb313feb53cef /arch/i386 | |
| parent | 0a9da4bd8eb30fb3f36e841c2cc72e426a17bbe2 (diff) | |
[PATCH] lockdep: annotate enable_in_hardirq()
Make use of local_irq_enable_in_hardirq() API to annotate places that enable
hardirqs in hardirq context.
Has no effect on non-lockdep kernels.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/nmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c index a76e93146585..2dd928a84645 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi.c | |||
| @@ -107,7 +107,7 @@ int nmi_active; | |||
| 107 | static __init void nmi_cpu_busy(void *data) | 107 | static __init void nmi_cpu_busy(void *data) |
| 108 | { | 108 | { |
| 109 | volatile int *endflag = data; | 109 | volatile int *endflag = data; |
| 110 | local_irq_enable(); | 110 | local_irq_enable_in_hardirq(); |
| 111 | /* Intentionally don't use cpu_relax here. This is | 111 | /* Intentionally don't use cpu_relax here. This is |
| 112 | to make sure that the performance counter really ticks, | 112 | to make sure that the performance counter really ticks, |
| 113 | even if there is a simulator or similar that catches the | 113 | even if there is a simulator or similar that catches the |