patch-1.3.5 linux/arch/i386/boot/compressed/head.S

Next file: linux/arch/i386/boot/tools/build.c
Previous file: linux/arch/i386/boot/compressed/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.4/linux/arch/i386/boot/compressed/head.S linux/arch/i386/boot/compressed/head.S
@@ -19,8 +19,10 @@
 .text
 
 #define __ASSEMBLY__
+#include <linux/linkage.h>
 #include <asm/segment.h>
 
+	.globl startup_32
 startup_32:
 	cld
 	cli
@@ -29,7 +31,7 @@
 	mov %ax,%es
 	mov %ax,%fs
 	mov %ax,%gs
-	lss _stack_start,%esp
+	lss SYMBOL_NAME(stack_start),%esp
 	xorl %eax,%eax
 1:	incl %eax		# check that A20 really IS enabled
 	movl %eax,0x000000	# loop forever if it isn't
@@ -46,8 +48,8 @@
  * Clear BSS
  */
 	xorl %eax,%eax
-	movl $__edata,%edi
-	movl $__end,%ecx
+	movl $ SYMBOL_NAME(_edata),%edi
+	movl $ SYMBOL_NAME(_end),%ecx
 	subl %edi,%ecx
 	cld
 	rep
@@ -55,5 +57,5 @@
 /*
  * Do the decompression, and jump to the new kernel..
  */
-	call _decompress_kernel
+	call SYMBOL_NAME(decompress_kernel)
 	ljmp $(KERNEL_CS), $0x100000

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this