diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-06-17 06:52:15 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-06-17 06:56:49 -0400 |
commit | eadb8a091b27a840de7450f84ecff5ef13476424 (patch) | |
tree | 58c3782d40def63baa8167f3d31e3048cb4c7660 /arch/x86/kernel/hw_breakpoint.c | |
parent | 73874005cd8800440be4299bd095387fff4b90ac (diff) | |
parent | 65795efbd380a832ae508b04dba8f8e53f0b84d9 (diff) |
Merge branch 'linus' into tracing/hw-breakpoints
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/traps.c
arch/x86/power/cpu.c
arch/x86/power/cpu_32.c
kernel/Makefile
Semantic conflict:
arch/x86/kernel/hw_breakpoint.c
Merge reason: Resolve the conflicts, move from put_cpu_no_sched() to
put_cpu() in arch/x86/kernel/hw_breakpoint.c.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/hw_breakpoint.c')
-rw-r--r-- | arch/x86/kernel/hw_breakpoint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/hw_breakpoint.c b/arch/x86/kernel/hw_breakpoint.c index 69451473dbd..51d959528b1 100644 --- a/arch/x86/kernel/hw_breakpoint.c +++ b/arch/x86/kernel/hw_breakpoint.c | |||
@@ -91,7 +91,7 @@ void arch_update_kernel_hw_breakpoint(void *unused) | |||
91 | */ | 91 | */ |
92 | kdr7 = temp_kdr7; | 92 | kdr7 = temp_kdr7; |
93 | set_debugreg(kdr7 | current->thread.debugreg7, 7); | 93 | set_debugreg(kdr7 | current->thread.debugreg7, 7); |
94 | put_cpu_no_resched(); | 94 | put_cpu(); |
95 | } | 95 | } |
96 | 96 | ||
97 | /* | 97 | /* |
@@ -374,7 +374,7 @@ int __kprobes hw_breakpoint_handler(struct die_args *args) | |||
374 | rc = NOTIFY_DONE; | 374 | rc = NOTIFY_DONE; |
375 | 375 | ||
376 | set_debugreg(dr7, 7); | 376 | set_debugreg(dr7, 7); |
377 | put_cpu_no_resched(); | 377 | put_cpu(); |
378 | return rc; | 378 | return rc; |
379 | } | 379 | } |
380 | 380 | ||