patch-2.1.86 linux/arch/i386/kernel/head.S

• Lines: 35
• Date: Mon Feb 9 17:51:19 1998
• Orig file: v2.1.85/linux/arch/i386/kernel/head.S
• Orig date: Tue Dec 23 10:45:12 1997

diff -u --recursive --new-file v2.1.85/linux/arch/i386/kernel/head.S linux/arch/i386/kernel/head.S
@@ -11,7 +11,6 @@
 #include <linux/tasks.h>
 #include <linux/linkage.h>
 #include <asm/segment.h>
-#include <linux/config.h>
 
 #define CL_MAGIC_ADDR	0x90020
 #define CL_MAGIC	0xA33F
@@ -423,11 +422,7 @@
  * of tasks we can have..
  */
 #define IDT_ENTRIES	256
-#ifdef CONFIG_APM
-#define GDT_ENTRIES	(11+2*NR_TASKS)
-#else
-#define GDT_ENTRIES	(8+2*NR_TASKS)
-#endif
+#define GDT_ENTRIES	(12+2*NR_TASKS)
 
 
 .globl SYMBOL_NAME(idt)
@@ -637,9 +632,8 @@
 	.quad 0x00cff2000000ffff	/* 0x2b user   4GB data at 0x00000000 */
 	.quad 0x0000000000000000	/* not used */
 	.quad 0x0000000000000000	/* not used */
+	.quad 0x00c0920000000000	/* 0x40 APM set up for bad BIOS's */
+	.quad 0x00c09a0000000000	/* 0x48 APM CS    code */
+	.quad 0x00809a0000000000	/* 0x50 APM CS 16 code (16 bit) */
+	.quad 0x00c0920000000000	/* 0x58 APM DS    data */
 	.fill 2*NR_TASKS,8,0		/* space for LDT's and TSS's etc */
-#ifdef CONFIG_APM
-	.quad 0x00c09a0000000000	/* APM CS    code */
-	.quad 0x00809a0000000000	/* APM CS 16 code (16 bit) */
-	.quad 0x00c0920000000000	/* APM DS    data */
-#endif