diff options
| author | Brian Gerst <brgerst@gmail.com> | 2009-01-21 17:26:05 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-01-21 17:26:05 +0900 |
| commit | 0dd76d736eeb3e0ef86c5b103b47ae0e15edebad (patch) | |
| tree | 1ab75fceefae986c80dbe1e86a7975df3fb5d9fd /arch/x86/kernel/head_32.S | |
| parent | 299e26992a737804e13e74fdb97cdab470ed19ac (diff) | |
| download | linux-0dd76d736eeb3e0ef86c5b103b47ae0e15edebad.tar.gz linux-0dd76d736eeb3e0ef86c5b103b47ae0e15edebad.tar.bz2 linux-0dd76d736eeb3e0ef86c5b103b47ae0e15edebad.zip | |
x86: set %fs to __KERNEL_PERCPU unconditionally for x86_32
Impact: cleanup
%fs is currently set to __KERNEL_DS at boot, and conditionally
switched to __KERNEL_PERCPU for secondary cpus. Instead, initialize
GDT_ENTRY_PERCPU to the same attributes as GDT_ENTRY_KERNEL_DS and
set %fs to __KERNEL_PERCPU unconditionally.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
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 e835b4eea70b..24c0e5cd71e3 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -429,12 +429,14 @@ is386: movl $2,%ecx # set MP ljmp $(__KERNEL_CS),$1f 1: movl $(__KERNEL_DS),%eax # reload all the segment registers movl %eax,%ss # after changing gdt. - movl %eax,%fs # gets reset once there's real percpu movl $(__USER_DS),%eax # DS/ES contains default USER segment movl %eax,%ds movl %eax,%es + movl $(__KERNEL_PERCPU), %eax + movl %eax,%fs # set this cpu's percpu + xorl %eax,%eax # Clear GS and LDT movl %eax,%gs lldt %ax @@ -446,8 +448,6 @@ is386: movl $2,%ecx # set MP movb $1, ready cmpb $0,%cl # the first CPU calls start_kernel je 1f - movl $(__KERNEL_PERCPU), %eax - movl %eax,%fs # set this cpu's percpu movl (stack_start), %esp 1: #endif /* CONFIG_SMP */ |