diff options
| -rw-r--r-- | arch/x86/include/asm/suspend_32.h | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/acpi/wakeup_32.S | 3 | ||||
| -rw-r--r-- | arch/x86/power/cpu.c | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/include/asm/suspend_32.h b/arch/x86/include/asm/suspend_32.h index 487055c8c1aa..f6064b7385b0 100644 --- a/arch/x86/include/asm/suspend_32.h +++ b/arch/x86/include/asm/suspend_32.h | |||
| @@ -15,7 +15,6 @@ struct saved_context { | |||
| 15 | unsigned long cr0, cr2, cr3, cr4; | 15 | unsigned long cr0, cr2, cr3, cr4; |
| 16 | u64 misc_enable; | 16 | u64 misc_enable; |
| 17 | bool misc_enable_saved; | 17 | bool misc_enable_saved; |
| 18 | struct desc_ptr gdt; | ||
| 19 | struct desc_ptr idt; | 18 | struct desc_ptr idt; |
| 20 | u16 ldt; | 19 | u16 ldt; |
| 21 | u16 tss; | 20 | u16 tss; |
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S index 13ab720573e3..91adb1be24bc 100644 --- a/arch/x86/kernel/acpi/wakeup_32.S +++ b/arch/x86/kernel/acpi/wakeup_32.S | |||
| @@ -18,7 +18,6 @@ wakeup_pmode_return: | |||
| 18 | movw %ax, %gs | 18 | movw %ax, %gs |
| 19 | 19 | ||
| 20 | # reload the gdt, as we need the full 32 bit address | 20 | # reload the gdt, as we need the full 32 bit address |
| 21 | lgdt saved_gdt | ||
| 22 | lidt saved_idt | 21 | lidt saved_idt |
| 23 | lldt saved_ldt | 22 | lldt saved_ldt |
| 24 | ljmp $(__KERNEL_CS), $1f | 23 | ljmp $(__KERNEL_CS), $1f |
| @@ -44,7 +43,6 @@ bogus_magic: | |||
| 44 | 43 | ||
| 45 | 44 | ||
| 46 | save_registers: | 45 | save_registers: |
| 47 | sgdt saved_gdt | ||
| 48 | sidt saved_idt | 46 | sidt saved_idt |
| 49 | sldt saved_ldt | 47 | sldt saved_ldt |
| 50 | str saved_tss | 48 | str saved_tss |
| @@ -93,7 +91,6 @@ ENTRY(saved_magic) .long 0 | |||
| 93 | ENTRY(saved_eip) .long 0 | 91 | ENTRY(saved_eip) .long 0 |
| 94 | 92 | ||
| 95 | # saved registers | 93 | # saved registers |
| 96 | saved_gdt: .long 0,0 | ||
| 97 | saved_idt: .long 0,0 | 94 | saved_idt: .long 0,0 |
| 98 | saved_ldt: .long 0 | 95 | saved_ldt: .long 0 |
| 99 | saved_tss: .long 0 | 96 | saved_tss: .long 0 |
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index 6bd94233669c..82c39c532349 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c | |||
| @@ -61,7 +61,6 @@ static void __save_processor_state(struct saved_context *ctxt) | |||
| 61 | * descriptor tables | 61 | * descriptor tables |
| 62 | */ | 62 | */ |
| 63 | #ifdef CONFIG_X86_32 | 63 | #ifdef CONFIG_X86_32 |
| 64 | store_gdt(&ctxt->gdt); | ||
| 65 | store_idt(&ctxt->idt); | 64 | store_idt(&ctxt->idt); |
| 66 | #else | 65 | #else |
| 67 | /* CONFIG_X86_64 */ | 66 | /* CONFIG_X86_64 */ |
| @@ -181,7 +180,6 @@ static void __restore_processor_state(struct saved_context *ctxt) | |||
| 181 | * ltr is done i fix_processor_context(). | 180 | * ltr is done i fix_processor_context(). |
| 182 | */ | 181 | */ |
| 183 | #ifdef CONFIG_X86_32 | 182 | #ifdef CONFIG_X86_32 |
| 184 | load_gdt(&ctxt->gdt); | ||
| 185 | load_idt(&ctxt->idt); | 183 | load_idt(&ctxt->idt); |
| 186 | #else | 184 | #else |
| 187 | /* CONFIG_X86_64 */ | 185 | /* CONFIG_X86_64 */ |
