patch-2.3.99-pre3 linux/arch/i386/kernel/entry.S

Next file: linux/arch/i386/kernel/i8259.c
Previous file: linux/arch/i386/defconfig
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre2/linux/arch/i386/kernel/entry.S linux/arch/i386/kernel/entry.S
@@ -174,9 +174,7 @@
 	jmp ret_from_sys_call
 
 
-	ALIGN
-	.globl	ret_from_fork
-ret_from_fork:
+ENTRY(ret_from_fork)
 	pushl %ebx
 	call SYMBOL_NAME(schedule_tail)
 	addl $4, %esp
@@ -202,10 +200,7 @@
 	jne tracesys
 	call *SYMBOL_NAME(sys_call_table)(,%eax,4)
 	movl %eax,EAX(%esp)		# save the return value
-	ALIGN
-	.globl ret_from_sys_call
-	.globl ret_from_intr
-ret_from_sys_call:
+ENTRY(ret_from_sys_call)
 #ifdef __SMP__
 	movl processor(%ebx),%eax
 	shll $5,%eax
@@ -273,8 +268,7 @@
 #endif
 	jne   handle_softirq
 
-	ALIGN
-ret_from_intr:
+ENTRY(ret_from_intr)
 	GET_CURRENT(%ebx)
 	movl EFLAGS(%esp),%eax		# mix EFLAGS and CS
 	movb CS(%esp),%al

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