From 63f7ecfae20a987d305a1330846221ea13dbf0c3 Mon Sep 17 00:00:00 2001 From: Zachary Amsden Date: Fri, 10 Aug 2007 22:31:05 +0200 Subject: [PATCH] --- yaml --- r: 63880 b: refs/heads/master c: 08da5a2ca479c5e8805dc3f77fd77176c4293399 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/boot/compressed/head.S | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 07607e3a4e52..fa4fdb069705 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab144f5ec64c42218a555ec1dbde6b60cf2982d6 +refs/heads/master: 08da5a2ca479c5e8805dc3f77fd77176c4293399 diff --git a/trunk/arch/x86_64/boot/compressed/head.S b/trunk/arch/x86_64/boot/compressed/head.S index 1312bfaff306..9fd8030cc54f 100644 --- a/trunk/arch/x86_64/boot/compressed/head.S +++ b/trunk/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 */