***************
*** 37,43 ****
  	andi	t0, t0, KU_USER
  	beqz	t0, resume_kernel
  
- FEXPORT(resume_userspace)
  	local_irq_disable	t0	# make sure we dont miss an
  					# interrupt setting need_resched
  					# between sampling and return
--- 37,44 ----
  	andi	t0, t0, KU_USER
  	beqz	t0, resume_kernel
  
+ /*--- FEXPORT(resume_userspace) ---*/
+ resume_userspace:
  	local_irq_disable	t0	# make sure we dont miss an
  					# interrupt setting need_resched
  					# between sampling and return
***************
*** 47,53 ****
  	j	restore_all
  
  #ifdef CONFIG_PREEMPT
- ENTRY(resume_kernel)
  	lw	t0, TI_PRE_COUNT($28)
  	bnez	t0, restore_all
  need_resched:
--- 48,55 ----
  	j	restore_all
  
  #ifdef CONFIG_PREEMPT
+ /*--- ENTRY(resume_kernel) ---*/
+ resume_kernel:
  	lw	t0, TI_PRE_COUNT($28)
  	bnez	t0, restore_all
  need_resched:
***************
*** 78,84 ****
  	and	t0, a2, t0
  	bnez	t0, syscall_exit_work
  
- FEXPORT(restore_all)			# restore full frame
  	.set	noat
  	RESTORE_TEMP
  	RESTORE_AT
--- 80,87 ----
  	and	t0, a2, t0
  	bnez	t0, syscall_exit_work
  
+ /*--- FEXPORT(restore_all)			# restore full frame ---*/
+ restore_all:
  	.set	noat
  	RESTORE_TEMP
  	RESTORE_AT
***************
*** 88,94 ****
  	RESTORE_SP_AND_RET
  	.set	at
  
- FEXPORT(work_pending)
  	andi	t0, a2, _TIF_NEED_RESCHED
  	beqz	t0, work_notifysig
  work_resched:
--- 91,98 ----
  	RESTORE_SP_AND_RET
  	.set	at
  
+ /*--- FEXPORT(work_pending) ---*/
+ work_pending:
  	andi	t0, a2, _TIF_NEED_RESCHED
  	beqz	t0, work_notifysig
  work_resched:
***************
*** 113,119 ****
  
  FEXPORT(syscall_exit_work_partial)
  	SAVE_STATIC
- FEXPORT(syscall_exit_work)
  	LONG_L	t0, TI_FLAGS($28)
  	li	t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
  	and	t0, t1
--- 117,124 ----
  
  FEXPORT(syscall_exit_work_partial)
  	SAVE_STATIC
+ /*--- FEXPORT(syscall_exit_work) ---*/
+ syscall_exit_work:
  	LONG_L	t0, TI_FLAGS($28)
  	li	t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
  	and	t0, t1