patch-2.4.22 linux-2.4.22/arch/sparc64/kernel/head.S

Next file: linux-2.4.22/arch/sparc64/kernel/ioctl32.c
Previous file: linux-2.4.22/arch/sparc64/defconfig
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/arch/sparc64/kernel/head.S linux-2.4.22/arch/sparc64/kernel/head.S
@@ -66,7 +66,7 @@
 sparc_ramdisk_size:
         .word   0
         .xword  reboot_command
-	.xword	bootstr_len
+	.xword	bootstr_info
 	.word	_end
 
 	/* We must be careful, 32-bit OpenBOOT will get confused if it
@@ -742,8 +742,9 @@
 
 	.data
 	.align	8
-	.globl	prom_tba
+	.globl	prom_tba, tlb_type
 prom_tba:	.xword	0
+tlb_type:	.word	0	/* Must NOT end up in BSS */
 	.section	".fixup",#alloc,#execinstr
 	.globl	__ret_efault
 __ret_efault:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)