diff options
| author | David Woodhouse | 2007-08-23 11:43:14 +0200 |
|---|---|---|
| committer | David Woodhouse | 2007-08-23 11:43:14 +0200 |
| commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
| tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /arch/x86_64/boot/compressed/head.S | |
| parent | [MTD] mtdoops printk warning fixes (diff) | |
| parent | Apply memory policies to top two highest zones when highest zone is ZONE_MOVABLE (diff) | |
| download | kernel-qcow2-linux-ac0c955d5048c2c580fa7166a89133f0fd76c125.tar.gz kernel-qcow2-linux-ac0c955d5048c2c580fa7166a89133f0fd76c125.tar.xz kernel-qcow2-linux-ac0c955d5048c2c580fa7166a89133f0fd76c125.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86_64/boot/compressed/head.S')
| -rw-r--r-- | arch/x86_64/boot/compressed/head.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86_64/boot/compressed/head.S b/arch/x86_64/boot/compressed/head.S index 1312bfaff306..9fd8030cc54f 100644 --- a/arch/x86_64/boot/compressed/head.S +++ b/arch/x86_64/boot/compressed/head.S @@ -195,6 +195,11 @@ ENTRY(startup_64) movl %eax, %ds movl %eax, %es movl %eax, %ss + movl %eax, %fs + movl %eax, %gs + lldt %ax + movl $0x20, %eax + ltr %ax /* Compute the decompressed kernel start address. It is where * we were loaded at aligned to a 2M boundary. %rbp contains the @@ -295,6 +300,8 @@ gdt: .quad 0x0000000000000000 /* NULL descriptor */ .quad 0x00af9a000000ffff /* __KERNEL_CS */ .quad 0x00cf92000000ffff /* __KERNEL_DS */ + .quad 0x0080890000000000 /* TS descriptor */ + .quad 0x0000000000000000 /* TS continued */ gdt_end: .bss /* Stack for uncompression */ |