diff options
| -rw-r--r-- | arch/x86/kernel/machine_kexec_32.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c index 00bc751c861c..edfede768688 100644 --- a/arch/x86/kernel/machine_kexec_32.c +++ b/arch/x86/kernel/machine_kexec_32.c | |||
| @@ -48,8 +48,6 @@ static void load_segments(void) | |||
| 48 | "\tmovl $"STR(__KERNEL_DS)",%%eax\n" | 48 | "\tmovl $"STR(__KERNEL_DS)",%%eax\n" |
| 49 | "\tmovl %%eax,%%ds\n" | 49 | "\tmovl %%eax,%%ds\n" |
| 50 | "\tmovl %%eax,%%es\n" | 50 | "\tmovl %%eax,%%es\n" |
| 51 | "\tmovl %%eax,%%fs\n" | ||
| 52 | "\tmovl %%eax,%%gs\n" | ||
| 53 | "\tmovl %%eax,%%ss\n" | 51 | "\tmovl %%eax,%%ss\n" |
| 54 | : : : "eax", "memory"); | 52 | : : : "eax", "memory"); |
| 55 | #undef STR | 53 | #undef STR |
| @@ -232,8 +230,8 @@ void machine_kexec(struct kimage *image) | |||
| 232 | * The gdt & idt are now invalid. | 230 | * The gdt & idt are now invalid. |
| 233 | * If you want to load them you must set up your own idt & gdt. | 231 | * If you want to load them you must set up your own idt & gdt. |
| 234 | */ | 232 | */ |
| 235 | set_gdt(phys_to_virt(0), 0); | ||
| 236 | idt_invalidate(phys_to_virt(0)); | 233 | idt_invalidate(phys_to_virt(0)); |
| 234 | set_gdt(phys_to_virt(0), 0); | ||
| 237 | 235 | ||
| 238 | /* now call it */ | 236 | /* now call it */ |
| 239 | image->start = relocate_kernel_ptr((unsigned long)image->head, | 237 | image->start = relocate_kernel_ptr((unsigned long)image->head, |
