patch-2.3.99-pre6 linux/arch/i386/kernel/head.S

• Lines: 71
• Date: Mon Apr 24 13:39:34 2000
• Orig file: v2.3.99-pre5/linux/arch/i386/kernel/head.S
• Orig date: Tue Apr 11 15:09:12 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/arch/i386/kernel/head.S linux/arch/i386/kernel/head.S
@@ -51,7 +51,7 @@
 	movl %eax,%es
 	movl %eax,%fs
 	movl %eax,%gs
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	orw %bx,%bx
 	jz 1f
 /*
@@ -105,14 +105,14 @@
 	/* Set up the stack pointer */
 	lss stack_start,%esp
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	orw  %bx,%bx
 	jz  1f				/* Initial CPU cleans BSS */
 	pushl $0
 	popfl
 	jmp checkCPUtype
 1:
-#endif __SMP__
+#endif CONFIG_SMP
 /*
  * Clear BSS first so that there are no surprises...
  */
@@ -159,7 +159,7 @@
 	rep
 	movsl
 1:
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 checkCPUtype:
 #endif
 
@@ -234,7 +234,7 @@
 	orl $2,%eax		# set MP
 2:	movl %eax,%cr0
 	call check_x87
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	incb ready
 #endif
 	lgdt gdt_descr
@@ -245,7 +245,7 @@
 	movl %eax,%es
 	movl %eax,%fs
 	movl %eax,%gs
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	movl $(__KERNEL_DS), %eax
 	movl %eax,%ss		# Reload the stack pointer (segment only)
 #else
@@ -254,7 +254,7 @@
 	xorl %eax,%eax
 	lldt %ax
 	cld			# gcc2 wants the direction flag cleared at all times
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	movb ready, %cl	
 	cmpb $1,%cl
 	je 1f			# the first CPU calls start_kernel
@@ -268,7 +268,7 @@
 	jmp L6			# main should never return here, but
 				# just in case, we know what happens.
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 ready:	.byte 0
 #endif