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

• Lines: 42
• Date: Sun Jul 11 09:11:46 1999
• Orig file: v2.3.10/linux/arch/i386/kernel/head.S
• Orig date: Thu Jan 14 22:57:25 1999

diff -u --recursive --new-file v2.3.10/linux/arch/i386/kernel/head.S linux/arch/i386/kernel/head.S
@@ -8,11 +8,12 @@
  */
 
 .text
-#include <linux/tasks.h>
+#include <linux/threads.h>
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
+#include <asm/desc.h>
 
 
 #define CL_MAGIC_ADDR	0x90020
@@ -330,7 +331,7 @@
  * of tasks we can have..
  */
 #define IDT_ENTRIES	256
-#define GDT_ENTRIES	(12+2*NR_TASKS)
+#define GDT_ENTRIES	(__TSS(NR_CPUS))
 
 
 .globl SYMBOL_NAME(idt)
@@ -519,8 +520,7 @@
 
 ALIGN
 /*
- * This contains up to 8192 quadwords depending on NR_TASKS - 64kB of
- * gdt entries.  Ugh. 
+ * This contains typically 140 quadwords, depending on NR_CPUS.
  *
  * NOTE! Make sure the gdt descriptor in head.S matches this if you
  * change anything.
@@ -542,7 +542,7 @@
 	.quad 0x00409a0000000000	/* 0x48 APM CS    code */
 	.quad 0x00009a0000000000	/* 0x50 APM CS 16 code (16 bit) */
 	.quad 0x0040920000000000	/* 0x58 APM DS    data */
-	.fill 2*NR_TASKS,8,0		/* space for LDT's and TSS's etc */
+	.fill NR_CPUS*4,8,0		/* space for TSS's and LDT's */
 
 /*
  * This is to aid debugging, the various locking macros will be putting