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

Next file: linux-2.4.22/arch/mips64/kernel/i8259.c
Previous file: linux-2.4.22/arch/mips64/kernel/gdb-stub.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/arch/mips64/kernel/head.S linux-2.4.22/arch/mips64/kernel/head.S
@@ -107,7 +107,7 @@
 
 	PTR_LA	$28, init_task_union		# init current pointer
 	daddiu	sp, $28, KERNEL_STACK_SIZE-32
-	set_saved_sp	sp, t0
+	set_saved_sp	sp, t0, t1
 
 	/* The firmware/bootloader passes argc/argp/envp
 	 * to us as arguments.  But clear bss first because
@@ -157,8 +157,6 @@
         or	t0, ST0_KX
 	mtc0	t0, CP0_STATUS
 
-	set_saved_sp	sp, t0
-
 	jal	start_secondary			# XXX: IP27: cboot
 
 	END(smp_bootstrap)
@@ -168,13 +166,10 @@
 
 	declare_saved_sp
 
-#undef PAGE_SIZE
-#define PAGE_SIZE	0x1000
-
 	.macro	page name, order=0
 	.globl	\name
-\name:	.size	\name, (PAGE_SIZE << \order)
-	.org	. + (PAGE_SIZE << \order)
+\name:	.size	\name, (_PAGE_SIZE << \order)
+	.org	. + (_PAGE_SIZE << \order)
 	.type	\name, @object
 	.endm
 

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