lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86/apic' into perfcounters/core

Browse Source 
Conflicts:
	arch/x86/kernel/cpu/perfctr-watchdog.c
This commit is contained in:
Ingo Molnar
2009-02-17 17:20:11 +01:00
parent 37a2542425 f62bae5009
commit 0b6de00922
145 changed files with 10733 additions and 10814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/kernel/traps.c
View File

@@ -98,6 +98,12 @@ static inline void preempt_conditional_sti(struct pt_regs *regs)
local_irq_enable();
}
static inline void conditional_cli(struct pt_regs *regs)
{
if (regs->flags & X86_EFLAGS_IF)
local_irq_disable();
}
static inline void preempt_conditional_cli(struct pt_regs *regs)
{
if (regs->flags & X86_EFLAGS_IF)
@@ -625,8 +631,10 @@ clear_dr7:
#ifdef CONFIG_X86_32
debug_vm86:
/* reenable preemption: handle_vm86_trap() might sleep */
dec_preempt_count();
handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code, 1);
preempt_conditional_cli(regs);
conditional_cli(regs);
return;
#endif