--- zzzz-none-000/linux-2.6.13.1/arch/mips/kernel/entry.S	2005-09-10 02:42:58.000000000 +0000
+++ ohio-7170-487/linux-2.6.13.1/arch/mips/kernel/entry.S	2005-10-12 12:37:29.000000000 +0000
@@ -37,7 +37,8 @@
 	andi	t0, t0, KU_USER
 	beqz	t0, resume_kernel
 
-FEXPORT(resume_userspace)
+/*--- FEXPORT(resume_userspace) ---*/
+resume_userspace:
 	local_irq_disable	t0	# make sure we dont miss an
 					# interrupt setting need_resched
 					# between sampling and return
@@ -47,7 +48,8 @@
 	j	restore_all
 
 #ifdef CONFIG_PREEMPT
-ENTRY(resume_kernel)
+/*--- ENTRY(resume_kernel) ---*/
+resume_kernel:
 	lw	t0, TI_PRE_COUNT($28)
 	bnez	t0, restore_all
 need_resched:
@@ -78,7 +80,8 @@
 	and	t0, a2, t0
 	bnez	t0, syscall_exit_work
 
-FEXPORT(restore_all)			# restore full frame
+/*--- FEXPORT(restore_all)			# restore full frame ---*/
+restore_all:
 	.set	noat
 	RESTORE_TEMP
 	RESTORE_AT
@@ -88,7 +91,8 @@
 	RESTORE_SP_AND_RET
 	.set	at
 
-FEXPORT(work_pending)
+/*--- FEXPORT(work_pending) ---*/
+work_pending:
 	andi	t0, a2, _TIF_NEED_RESCHED
 	beqz	t0, work_notifysig
 work_resched:
@@ -113,7 +117,8 @@
 
 FEXPORT(syscall_exit_work_partial)
 	SAVE_STATIC
-FEXPORT(syscall_exit_work)
+/*--- FEXPORT(syscall_exit_work) ---*/
+syscall_exit_work:
 	LONG_L	t0, TI_FLAGS($28)
 	li	t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
 	and	t0, t1