From 4ec210f37b4e0ca9e80b76c0c21e6b775bbb24f3 Mon Sep 17 00:00:00 2001 From: Vivek Goyal Date: Wed, 2 May 2007 19:27:07 +0200 Subject: [PATCH] --- yaml --- r: 53763 b: refs/heads/master c: 30f472895401fbe8e64f861a2569bc9acb098741 h: refs/heads/master i: 53761: 60c23bfae79981a86e77a5da94b51a73107e5e5b 53759: 0a2949eb3d4d6500ad38d7f23976117850f5a779 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/head.S | 12 ++++++------ trunk/include/asm-x86_64/segment.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 50a8bcceba61..b4ca03b7c56c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 278c0eb7f96586c02b2bfaa8e250d951919a2e6a +refs/heads/master: 30f472895401fbe8e64f861a2569bc9acb098741 diff --git a/trunk/arch/x86_64/kernel/head.S b/trunk/arch/x86_64/kernel/head.S index 23b45e79a27c..2b2e2c51e532 100644 --- a/trunk/arch/x86_64/kernel/head.S +++ b/trunk/arch/x86_64/kernel/head.S @@ -362,13 +362,13 @@ gdt: ENTRY(cpu_gdt_table) .quad 0x0000000000000000 /* NULL descriptor */ + .quad 0x00cf9b000000ffff /* __KERNEL32_CS */ + .quad 0x00af9b000000ffff /* __KERNEL_CS */ + .quad 0x00cf93000000ffff /* __KERNEL_DS */ + .quad 0x00cffb000000ffff /* __USER32_CS */ + .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */ + .quad 0x00affb000000ffff /* __USER_CS */ .quad 0x0 /* unused */ - .quad 0x00af9a000000ffff /* __KERNEL_CS */ - .quad 0x00cf92000000ffff /* __KERNEL_DS */ - .quad 0x00cffa000000ffff /* __USER32_CS */ - .quad 0x00cff2000000ffff /* __USER_DS, __USER32_DS */ - .quad 0x00affa000000ffff /* __USER_CS */ - .quad 0x00cf9a000000ffff /* __KERNEL32_CS */ .quad 0,0 /* TSS */ .quad 0,0 /* LDT */ .quad 0,0,0 /* three TLS descriptors */ diff --git a/trunk/include/asm-x86_64/segment.h b/trunk/include/asm-x86_64/segment.h index 334ddcdd8f92..adf2bf1e187c 100644 --- a/trunk/include/asm-x86_64/segment.h +++ b/trunk/include/asm-x86_64/segment.h @@ -6,7 +6,7 @@ #define __KERNEL_CS 0x10 #define __KERNEL_DS 0x18 -#define __KERNEL32_CS 0x38 +#define __KERNEL32_CS 0x08 /* * we cannot use the same code segment descriptor for user and kernel