diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-12 12:17:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-12 12:17:36 +0200 |
| commit | 6cda3eb62ef42aa5acd649bf99c8db544e0f4051 (patch) | |
| tree | 93f74ca002f5756c8e157611174f9540b5cf41c0 /kernel/irq/handle.c | |
| parent | b9c61b70075c87a8612624736faf4a2de5b1ed30 (diff) | |
| parent | cec6be6d1069d697beb490bbb40a290d5ff554a2 (diff) | |
| download | op-kernel-dev-6cda3eb62ef42aa5acd649bf99c8db544e0f4051.zip op-kernel-dev-6cda3eb62ef42aa5acd649bf99c8db544e0f4051.tar.gz | |
Merge branch 'x86/apic' into irq/numa
Merge reason: both topics modify the APIC code but were able to do it in
parallel so far. An upcoming patch generates a conflict so
merge them to avoid the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq/handle.c')
| -rw-r--r-- | kernel/irq/handle.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index a6368db..a3c671e 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -360,8 +360,6 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action) irqreturn_t ret, retval = IRQ_NONE; unsigned int status = 0; - WARN_ONCE(!in_irq(), "BUG: IRQ handler called from non-hardirq context!"); - if (!(action->flags & IRQF_DISABLED)) local_irq_enable_in_hardirq(); |
