diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 04:35:30 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 04:35:30 -0400 |
commit | 5ea472a77f8e4811ceee3f44a9deda6ad6e8b789 (patch) | |
tree | a9ec5019e2b666a19874fc344ffb0dd5da6bce94 /kernel/exit.c | |
parent | 6c009ecef8cca28c7c09eb16d0802e37915a76e1 (diff) | |
parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) |
Merge commit 'v2.6.30-rc1' into perfcounters/core
Conflicts:
arch/powerpc/include/asm/systbl.h
arch/powerpc/include/asm/unistd.h
include/linux/init_task.h
Merge reason: the conflicts are non-trivial: PowerPC placement
of sys_perf_counter_open has to be mixed with the
new preadv/pwrite syscalls.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 fbb5d94c8bbc..4741376c8dec 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -926,6 +926,8 @@ NORET_TYPE void do_exit(long code) | |||
926 | schedule(); | 926 | schedule(); |
927 | } | 927 | } |
928 | 928 | ||
929 | exit_irq_thread(); | ||
930 | |||
929 | exit_signals(tsk); /* sets PF_EXITING */ | 931 | exit_signals(tsk); /* sets PF_EXITING */ |
930 | /* | 932 | /* |
931 | * tsk->flags are checked in the futex code to protect against | 933 | * tsk->flags are checked in the futex code to protect against |