diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-06-24 20:01:09 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-06-24 20:01:09 +0200 |
| commit | 5236eb968ec21c693d463d0494e39b00c1bc174d (patch) | |
| tree | 1bb6abc27df94dad156225b7d2ec31d04fd9cdd7 /arch/x86/kernel | |
| parent | x86/tracing: Add config option checking to the definitions of mce handlers (diff) | |
| parent | trace,x86: Do not call local_irq_save() in load_current_idt() (diff) | |
| download | linux-5236eb968ec21c693d463d0494e39b00c1bc174d.tar.xz linux-5236eb968ec21c693d463d0494e39b00c1bc174d.zip | |
Merge remote-tracking branch 'trace/tip/x86/trace' into x86/trace
Fix from Steven Rostedt.
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/tracepoint.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c index 1423efe98fbc..4e584a8d6edd 100644 --- a/arch/x86/kernel/tracepoint.c +++ b/arch/x86/kernel/tracepoint.c @@ -29,7 +29,11 @@ static void set_trace_idt_ctr(int val) static void switch_idt(void *arg) { + unsigned long flags; + + local_irq_save(flags); load_current_idt(); + local_irq_restore(flags); } void trace_irq_vector_regfunc(void) |