diff options
Diffstat (limited to 'arch/x86/kernel/head_64.S')
| -rw-r--r-- | arch/x86/kernel/head_64.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 780cd928fcd5..2d8b5035371c 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S | |||
| @@ -212,8 +212,8 @@ ENTRY(secondary_startup_64) | |||
| 212 | */ | 212 | */ |
| 213 | lgdt early_gdt_descr(%rip) | 213 | lgdt early_gdt_descr(%rip) |
| 214 | 214 | ||
| 215 | /* set up data segments. actually 0 would do too */ | 215 | /* set up data segments */ |
| 216 | movl $__KERNEL_DS,%eax | 216 | xorl %eax,%eax |
| 217 | movl %eax,%ds | 217 | movl %eax,%ds |
| 218 | movl %eax,%ss | 218 | movl %eax,%ss |
| 219 | movl %eax,%es | 219 | movl %eax,%es |
| @@ -262,11 +262,11 @@ ENTRY(secondary_startup_64) | |||
| 262 | .quad x86_64_start_kernel | 262 | .quad x86_64_start_kernel |
| 263 | ENTRY(initial_gs) | 263 | ENTRY(initial_gs) |
| 264 | .quad INIT_PER_CPU_VAR(irq_stack_union) | 264 | .quad INIT_PER_CPU_VAR(irq_stack_union) |
| 265 | __FINITDATA | ||
| 266 | 265 | ||
| 267 | ENTRY(stack_start) | 266 | ENTRY(stack_start) |
| 268 | .quad init_thread_union+THREAD_SIZE-8 | 267 | .quad init_thread_union+THREAD_SIZE-8 |
| 269 | .word 0 | 268 | .word 0 |
| 269 | __FINITDATA | ||
| 270 | 270 | ||
| 271 | bad_address: | 271 | bad_address: |
| 272 | jmp bad_address | 272 | jmp bad_address |
| @@ -340,6 +340,7 @@ ENTRY(name) | |||
| 340 | i = i + 1 ; \ | 340 | i = i + 1 ; \ |
| 341 | .endr | 341 | .endr |
| 342 | 342 | ||
| 343 | .data | ||
| 343 | /* | 344 | /* |
| 344 | * This default setting generates an ident mapping at address 0x100000 | 345 | * This default setting generates an ident mapping at address 0x100000 |
| 345 | * and a mapping for the kernel that precisely maps virtual address | 346 | * and a mapping for the kernel that precisely maps virtual address |