diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-07 16:17:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-07 16:17:37 -0400 |
| commit | 8b061610dac3a3b89770c85ad63b481a47b0c38e (patch) | |
| tree | 3ab93ad7f8f3e8bd612cff4e59d55d5a36c0c1fa /kernel/exit.c | |
| parent | c2bf807eb347325988b1c7f9139e934ed9b1d795 (diff) | |
| parent | 174a7b1f9692acad7f0ca2b02f696894201a6d94 (diff) | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf tools: Makefile: Use gcc to determine ARCH
perf events, x86: Fix Intel Nehalem and Westmere last level cache event definitions
hw_breakpoints, powerpc: Fix CONFIG_HAVE_HW_BREAKPOINT off-case in ptrace_set_debugreg()
sh, hw_breakpoints: Fix racy access to ptrace breakpoints
arm, hw_breakpoints: Fix racy access to ptrace breakpoints
powerpc, hw_breakpoints: Fix racy access to ptrace breakpoints
x86, hw_breakpoints: Fix racy access to ptrace breakpoints
ptrace: Prepare to fix racy accesses on task breakpoints
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index f5d2f63bae0b..8dd874181542 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
| @@ -1016,7 +1016,7 @@ NORET_TYPE void do_exit(long code) | |||
| 1016 | /* | 1016 | /* |
| 1017 | * FIXME: do that only when needed, using sched_exit tracepoint | 1017 | * FIXME: do that only when needed, using sched_exit tracepoint |
| 1018 | */ | 1018 | */ |
| 1019 | flush_ptrace_hw_breakpoint(tsk); | 1019 | ptrace_put_breakpoints(tsk); |
| 1020 | 1020 | ||
| 1021 | exit_notify(tsk, group_dead); | 1021 | exit_notify(tsk, group_dead); |
| 1022 | #ifdef CONFIG_NUMA | 1022 | #ifdef CONFIG_NUMA |