vserver 2.0 rc7

[linux-2.6.git] / arch / i386 / kernel / head.S

diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S
index ea1ef3a..e966fc8 100644 (file)
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
@@ -380,6 +380,7 @@ rp_sidt:
        ALIGN
 ignore_int:
        cld
+#ifdef CONFIG_PRINTK
        pushl %eax
        pushl %ecx
        pushl %edx
@@ -400,6 +401,7 @@ ignore_int:
        popl %edx
        popl %ecx
        popl %eax
+#endif
        iret
 
 /*
@@ -512,7 +514,7 @@ ENTRY(cpu_gdt_table)
        .quad 0x00009a0000000000        /* 0xc0 APM CS 16 code (16 bit) */
        .quad 0x0040920000000000        /* 0xc8 APM DS    data */
 
-       .quad 0x0000000000000000        /* 0xd0 - unused */
+       .quad 0x0000920000000000        /* 0xd0 - ESPFIX 16-bit SS */
        .quad 0x0000000000000000        /* 0xd8 - unused */
        .quad 0x0000000000000000        /* 0xe0 - unused */
        .quad 0x0000000000000000        /* 0xe8 - unused */