diff options
author | Robert Richter <robert.richter@amd.com> | 2010-06-04 05:33:10 -0400 |
---|---|---|
committer | Robert Richter <robert.richter@amd.com> | 2010-06-04 05:33:10 -0400 |
commit | d8a382d2662822248a97ce9d670b90e68aefbd3a (patch) | |
tree | 4f5bbd5d0a5881ed42de611402ea4ac2c6d6ff48 /arch/x86/kernel/dumpstack.c | |
parent | 45c34e05c4e3d36e7c44e790241ea11a1d90d54e (diff) | |
parent | c6df8d5ab87a246942d138321e1721edbb69f6e1 (diff) |
Merge remote branch 'tip/perf/urgent' into oprofile/urgent
Diffstat (limited to 'arch/x86/kernel/dumpstack.c')
-rw-r--r-- | arch/x86/kernel/dumpstack.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 6d817554780a..c89a386930b7 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c | |||
@@ -224,11 +224,6 @@ unsigned __kprobes long oops_begin(void) | |||
224 | int cpu; | 224 | int cpu; |
225 | unsigned long flags; | 225 | unsigned long flags; |
226 | 226 | ||
227 | /* notify the hw-branch tracer so it may disable tracing and | ||
228 | add the last trace to the trace buffer - | ||
229 | the earlier this happens, the more useful the trace. */ | ||
230 | trace_hw_branch_oops(); | ||
231 | |||
232 | oops_enter(); | 227 | oops_enter(); |
233 | 228 | ||
234 | /* racy, but better than risking deadlock. */ | 229 | /* racy, but better than risking deadlock. */ |