diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
| commit | 0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3 (patch) | |
| tree | 92f55e374a84d06ce8213a4540454760fdecf137 /arch/i386/kernel/cpu/common.c | |
| parent | 8ef12c9f01afba47c2d33bb939085111ca0d0f7d (diff) | |
| parent | 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f (diff) | |
Merge Linus' tree.
Diffstat (limited to 'arch/i386/kernel/cpu/common.c')
| -rw-r--r-- | arch/i386/kernel/cpu/common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c index cca655688ffc..170400879f44 100644 --- a/arch/i386/kernel/cpu/common.c +++ b/arch/i386/kernel/cpu/common.c | |||
| @@ -609,8 +609,10 @@ void __devinit cpu_init(void) | |||
| 609 | load_TR_desc(); | 609 | load_TR_desc(); |
| 610 | load_LDT(&init_mm.context); | 610 | load_LDT(&init_mm.context); |
| 611 | 611 | ||
| 612 | #ifdef CONFIG_DOUBLEFAULT | ||
| 612 | /* Set up doublefault TSS pointer in the GDT */ | 613 | /* Set up doublefault TSS pointer in the GDT */ |
| 613 | __set_tss_desc(cpu, GDT_ENTRY_DOUBLEFAULT_TSS, &doublefault_tss); | 614 | __set_tss_desc(cpu, GDT_ENTRY_DOUBLEFAULT_TSS, &doublefault_tss); |
| 615 | #endif | ||
| 614 | 616 | ||
| 615 | /* Clear %fs and %gs. */ | 617 | /* Clear %fs and %gs. */ |
| 616 | asm volatile ("xorl %eax, %eax; movl %eax, %fs; movl %eax, %gs"); | 618 | asm volatile ("xorl %eax, %eax; movl %eax, %fs; movl %eax, %gs"); |