diff options
Diffstat (limited to 'arch/x86/kernel/head_32.S')
-rw-r--r-- | arch/x86/kernel/head_32.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 050c278481b1..fd39eaf83b84 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
@@ -438,8 +438,8 @@ is386: movl $2,%ecx # set MP | |||
438 | */ | 438 | */ |
439 | cmpb $0,ready | 439 | cmpb $0,ready |
440 | jne 1f | 440 | jne 1f |
441 | movl $per_cpu__gdt_page,%eax | 441 | movl $gdt_page,%eax |
442 | movl $per_cpu__stack_canary,%ecx | 442 | movl $stack_canary,%ecx |
443 | movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax) | 443 | movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax) |
444 | shrl $16, %ecx | 444 | shrl $16, %ecx |
445 | movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax) | 445 | movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax) |
@@ -702,7 +702,7 @@ idt_descr: | |||
702 | .word 0 # 32 bit align gdt_desc.address | 702 | .word 0 # 32 bit align gdt_desc.address |
703 | ENTRY(early_gdt_descr) | 703 | ENTRY(early_gdt_descr) |
704 | .word GDT_ENTRIES*8-1 | 704 | .word GDT_ENTRIES*8-1 |
705 | .long per_cpu__gdt_page /* Overwritten for secondary CPUs */ | 705 | .long gdt_page /* Overwritten for secondary CPUs */ |
706 | 706 | ||
707 | /* | 707 | /* |
708 | * The boot_gdt must mirror the equivalent in setup.S and is | 708 | * The boot_gdt must mirror the equivalent in setup.S and is |