diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 17:07:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 17:07:52 -0400 |
commit | c61b79b6ef266890954213a701d8f6021d8c1289 (patch) | |
tree | 9b000a7dae5a782a0d667137ab43e4f1bea70d58 /kernel/exit.c | |
parent | 2b2ec7554cf7ec5e4412f89a5af6abe8ce950700 (diff) | |
parent | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (diff) |
Merge branch 'irq/threaded' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq/threaded' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
genirq: fix devres.o build for GENERIC_HARDIRQS=n
genirq: provide old request_irq() for CONFIG_GENERIC_HARDIRQ=n
genirq: threaded irq handlers review fixups
genirq: add support for threaded interrupts to devres
genirq: add threaded interrupt handler support
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 32cbf2607cb0..abf9cf3b95c6 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -923,6 +923,8 @@ NORET_TYPE void do_exit(long code) | |||
923 | schedule(); | 923 | schedule(); |
924 | } | 924 | } |
925 | 925 | ||
926 | exit_irq_thread(); | ||
927 | |||
926 | exit_signals(tsk); /* sets PF_EXITING */ | 928 | exit_signals(tsk); /* sets PF_EXITING */ |
927 | /* | 929 | /* |
928 | * tsk->flags are checked in the futex code to protect against | 930 | * tsk->flags are checked in the futex code to protect against |