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

Merge branch 'x86/paravirt' into x86/apic

Browse Source 
Conflicts:
	arch/x86/mach-voyager/voyager_smp.c
This commit is contained in:
Ingo Molnar
2009-02-09 12:16:59 +01:00
parent 54a353a0f8 e4d0407185
commit eca217b36e
27 changed files with 1401 additions and 1169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/entry_64.S
View File

@@ -1143,7 +1143,7 @@ ENTRY(native_load_gs_index)
CFI_STARTPROC
pushf
CFI_ADJUST_CFA_OFFSET 8
DISABLE_INTERRUPTS(CLBR_ANY | ~(CLBR_RDI))
DISABLE_INTERRUPTS(CLBR_ANY & ~CLBR_RDI)
SWAPGS
gs_change:
movl %edi,%gs