Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'trace/tip/x86/trace' into x86/trace

Browse Source 
Fix from Steven Rostedt.
This commit is contained in:
H. Peter Anvin 2013-06-24 11:01:09 -07:00
commit 5236eb968e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/include/asm/desc.h
View File

@ -497,21 +497,19 @@ static inline void load_trace_idt(void)
#endif
/*
* the load_current_idt() is called with interrupt disabled by local_irq_save()
* The load_current_idt() must be called with interrupts disabled
* to avoid races. That way the IDT will always be set back to the expected
* descriptor.
* descriptor. It's also called when a CPU is being initialized, and
* that doesn't need to disable interrupts, as nothing should be
* bothering the CPU then.
*/
static inline void load_current_idt(void)
{
unsigned long flags;
local_irq_save(flags);
if (is_debug_idt_enabled())
load_debug_idt();
else if (is_trace_idt_enabled())
load_trace_idt();
else
load_idt((const struct desc_ptr *)&idt_descr);
local_irq_restore(flags);
}
#endif /* _ASM_X86_DESC_H */

4
arch/x86/kernel/tracepoint.c
View File

@ -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)