diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 06:16:59 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 06:16:59 -0500 |
| commit | eca217b36e5d7d4377493d5cedd89105e66a5a72 (patch) | |
| tree | 71f0ecd5225c3033d509b77a23ad7bc576cf0ab6 /arch/x86/kernel/entry_64.S | |
| parent | 54a353a0f845c1dad5fc8183872e750d667838ac (diff) | |
| parent | e4d0407185cdbdcfd99fc23bde2e5454bbc46329 (diff) | |
Merge branch 'x86/paravirt' into x86/apic
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
Diffstat (limited to 'arch/x86/kernel/entry_64.S')
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 1f7d697b5c00..fbcf96b295ff 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
| @@ -1143,7 +1143,7 @@ ENTRY(native_load_gs_index) | |||
| 1143 | CFI_STARTPROC | 1143 | CFI_STARTPROC |
| 1144 | pushf | 1144 | pushf |
| 1145 | CFI_ADJUST_CFA_OFFSET 8 | 1145 | CFI_ADJUST_CFA_OFFSET 8 |
| 1146 | DISABLE_INTERRUPTS(CLBR_ANY | ~(CLBR_RDI)) | 1146 | DISABLE_INTERRUPTS(CLBR_ANY & ~CLBR_RDI) |
| 1147 | SWAPGS | 1147 | SWAPGS |
| 1148 | gs_change: | 1148 | gs_change: |
| 1149 | movl %edi,%gs | 1149 | movl %edi,%gs |