[PATCH] Removing SYMBOL_NAME part 5

ARM arch

arch/arm/boot/compressed/head-shark.S

@@ -38,7 +38,7 @@ __beginning:	mov	r4, r0				@ save the entry to the firmware
 		adr	r1, __ofw_data
 		add	r2, r1, #4
 		mov	lr, pc
-		b	SYMBOL_NAME(ofw_init)
+		b	ofw_init
 		mov	r1, #0
 
 		adr	r2, __mmu_off			@ calculate physical address
@@ -109,7 +109,7 @@ __go_on:
 		add	sp, sp, #128
 		adr	r0, __ofw_data
 		mov	lr, pc
-		b	SYMBOL_NAME(create_params)
+		b	create_params
 	
 		mov	r8, #0
 		mov	r7, #15

arch/arm/boot/compressed/head.S

@@ -185,7 +185,7 @@ not_relocated:	mov	r0, #0
 		mov	r5, r2			@ decompress after malloc space
 		mov	r0, r5
 		mov	r3, r7
-		bl	SYMBOL_NAME(decompress_kernel)
+		bl	decompress_kernel
 
 		add	r0, r0, #127
 		bic	r0, r0, #127		@ align the kernel length
@@ -219,7 +219,7 @@ not_relocated:	mov	r0, #0
  */
 wont_overwrite:	mov	r0, r4
 		mov	r3, r7
-		bl	SYMBOL_NAME(decompress_kernel)
+		bl	decompress_kernel
 		b	call_kernel
 
 		.type	LC0, #object

arch/arm/boot/compressed/ll_char_wr.S

@@ -27,10 +27,10 @@
 #define FLASH           0x08
 #define INVERSE         0x10
 
-LC0:		.word	SYMBOL_NAME(bytes_per_char_h)
-		.word	SYMBOL_NAME(video_size_row)
-		.word	SYMBOL_NAME(acorndata_8x8)
-		.word	SYMBOL_NAME(con_charconvtable)
+LC0:		.word	bytes_per_char_h
+		.word	video_size_row
+		.word	acorndata_8x8
+		.word	con_charconvtable
 
 ENTRY(ll_write_char)
 		stmfd	sp!, {r4 - r7, lr}

arch/arm/kernel/entry-armo.S

@@ -147,7 +147,7 @@ _unexp_fiq:	ldr	sp, .LCfiq
 		mov	r0, r0
 		stmfd	sp!, {r0 - r3, ip, lr}
 		adr	r0, Lfiqmsg
-		bl	SYMBOL_NAME(printk)
+		bl	printk
 		ldmfd	sp!, {r0 - r3, ip, lr}
 		teqp	pc, #0x0c000001
 		mov	r0, r0
@@ -174,12 +174,12 @@ vector_undefinstr:
 		ldr	r4, .LC2
 		ldr	pc, [r4]			@ Call FP module USR entry point
 
-		.globl	SYMBOL_NAME(fpundefinstr)
-SYMBOL_NAME(fpundefinstr):				@ Called by FP module on undefined instr
+		.globl	fpundefinstr
+fpundefinstr:						@ Called by FP module on undefined instr
 		mov	r0, lr
 		mov	r1, sp
 		teqp	pc, #MODE_SVC
-		bl	SYMBOL_NAME(do_undefinstr)
+		bl	do_undefinstr
 		b	ret_from_exception		@ Normal FP exit
 
 __und_svc:	SVC_SAVE_ALL				@ Non-user mode
@@ -187,7 +187,7 @@ __und_svc:	SVC_SAVE_ALL				@ Non-user mode
 		and	r2, lr, #3
 		sub	r0, r0, #4
 		mov	r1, sp
-		bl	SYMBOL_NAME(do_undefinstr)
+		bl	do_undefinstr
 		SVC_RESTORE_ALL
 
 #if defined CONFIG_FPE_NWFPE || defined CONFIG_FPE_FASTFPE
@@ -232,7 +232,7 @@ wfs_mask_data:	.word	0x0e200110			@ WFS/RFS
 		.word	0x0f0f0f00
 #endif
 
-.LC2:		.word	SYMBOL_NAME(fp_enter)
+.LC2:		.word	fp_enter
 
 /*=============================================================================
  * Prefetch abort handler
@@ -247,12 +247,12 @@ vector_prefetch:
 		teqp	pc, #0x00000003		@ NOT a problem - doesnt change mode
 		mask_pc	r0, lr			@ Address of abort
 		mov	r1, sp			@ Tasks registers
-		bl	SYMBOL_NAME(do_PrefetchAbort)
+		bl	do_PrefetchAbort
 		teq	r0, #0			@ If non-zero, we believe this abort..
 		bne	ret_from_exception
 #ifdef DEBUG_UNDEF
 		adr	r0, t
-		bl	SYMBOL_NAME(printk)
+		bl	printk
 #endif
 		ldr	lr, [sp,#S_PC]		@ program to test this on.  I think its
 		b	.Lbug_undef		@ broken at the moment though!)
@@ -261,7 +261,7 @@ __pabt_invalid:	SVC_SAVE_ALL
 		mov	r0, sp				@ Prefetch aborts are definitely *not*
 		mov	r1, #BAD_PREFETCH		@ allowed in non-user modes.  We cant
 		and	r2, lr, #3			@ recover from this problem.
-		b	SYMBOL_NAME(bad_mode)
+		b	bad_mode
 
 #ifdef DEBUG_UNDEF
 t:		.ascii "*** undef ***\r\n\0"
@@ -287,7 +287,7 @@ vector_addrexcptn:
 		mov	r1, sp			@ Point to registers
 		mov	r2, #0x400
 		mov	lr, pc
-		bl	SYMBOL_NAME(do_excpt)
+		bl	do_excpt
 		b	ret_from_exception
 
 Laddrexcptn_not_user:
@@ -299,7 +299,7 @@ Laddrexcptn_not_user:
 		mask_pc	r0, lr
 		mov	r1, sp
 		orr	r2, r2, #0x400
-		bl	SYMBOL_NAME(do_excpt)
+		bl	do_excpt
 		ldmia	sp, {r0 - lr}		@ I cant remember the reason I changed this...
 		add	sp, sp, #15*4
 		movs	pc, lr
@@ -324,7 +324,7 @@ Laddrexcptn_illegal_mode:
 		stmfd	sp!, {r0-r7}
 		mov	r0, sp
 		mov	r1, #BAD_ADDREXCPTN
-		b	SYMBOL_NAME(bad_mode)
+		b	bad_mode
 
 /*=============================================================================
  * Interrupt (IRQ) handler
@@ -382,7 +382,7 @@ __irq_svc:	teqp	pc, #0x08000003
 
 __irq_invalid:	mov	r0, sp
 		mov	r1, #BAD_IRQ
-		b	SYMBOL_NAME(bad_mode)
+		b	bad_mode
 
 /*=============================================================================
  * Data abort handler code
@@ -418,7 +418,7 @@ Ldata_not_user:
 Ldata_illegal_mode:
 		mov	r0, sp
 		mov	r1, #BAD_DATA
-		b	SYMBOL_NAME(bad_mode)
+		b	bad_mode
 
 Ldata_do:	mov	r3, sp
 		ldr	r4, [r0]		@ Get instruction
@@ -460,7 +460,7 @@ Ldata_ldrstr_post:
 #ifdef FAULT_CODE_LDRSTRPOST
 		orr	r2, r2, #FAULT_CODE_LDRSTRPOST
 #endif
-		b	SYMBOL_NAME(do_DataAbort)
+		b	do_DataAbort
 
 Ldata_ldrstr_numindex:
 		mov	r0, r4, lsr #14		@ Get Rn
@@ -476,7 +476,7 @@ Ldata_ldrstr_numindex:
 #ifdef FAULT_CODE_LDRSTRPRE
 		orr	r2, r2, #FAULT_CODE_LDRSTRPRE
 #endif
-		b	SYMBOL_NAME(do_DataAbort)
+		b	do_DataAbort
 
 Ldata_ldrstr_regindex:
 		mov	r0, r4, lsr #14		@ Get Rn
@@ -506,7 +506,7 @@ Ldata_ldrstr_regindex:
 #ifdef FAULT_CODE_LDRSTRREG
 		orr	r2, r2, #FAULT_CODE_LDRSTRREG
 #endif
-		b	SYMBOL_NAME(do_DataAbort)
+		b	do_DataAbort
 
 Ldata_ldmstm:
 		mov	r7, #0x11
@@ -543,7 +543,7 @@ Ldata_ldmstm:
 #ifdef FAULT_CODE_LDMSTM
 		orr	r2, r2, #FAULT_CODE_LDMSTM
 #endif
-		b	SYMBOL_NAME(do_DataAbort)
+		b	do_DataAbort
 
 Ldata_ldcstc_pre:
 		mov	r0, r4, lsr #14		@ Get Rn
@@ -559,7 +559,7 @@ Ldata_ldcstc_pre:
 #ifdef FAULT_CODE_LDCSTC
 		orr	r2, r2, #FAULT_CODE_LDCSTC
 #endif
-		b	SYMBOL_NAME(do_DataAbort)
+		b	do_DataAbort
 
 
 /*

arch/arm/kernel/entry-armv.S

@@ -653,7 +653,7 @@ __und_invalid:	sub	sp, sp, #S_FRAME_SIZE
 		stmia	r4, {r5 - r7}			@ Save XXX pc, cpsr, old_r0
 		mov	r0, sp
 		and	r2, r6, #31			@ int mode
-		b	SYMBOL_NAME(bad_mode)
+		b	bad_mode
 
 #if defined CONFIG_FPE_NWFPE || defined CONFIG_FPE_FASTFPE
 		/* The FPE is always present */
@@ -725,7 +725,7 @@ __dabt_svc:	sub	sp, sp, #S_FRAME_SIZE
 #endif
 		msr	cpsr_c, r9
 		mov	r2, sp
-		bl	SYMBOL_NAME(do_DataAbort)
+		bl	do_DataAbort
 		set_cpsr_c r0, #PSR_I_BIT | MODE_SVC
 		ldr	r0, [sp, #S_PSR]
 		msr	spsr, r0
@@ -778,7 +778,7 @@ svc_preempt:	teq	r9, #0				@ was preempt count = 0
 		mov	r7, #PREEMPT_ACTIVE
 		str	r7, [r8, #TI_PREEMPT]		@ set PREEMPT_ACTIVE
 1:		set_cpsr_c r2, #MODE_SVC		@ enable IRQs
-		bl	SYMBOL_NAME(schedule)
+		bl	schedule
 		set_cpsr_c r0, #PSR_I_BIT | MODE_SVC	@ disable IRQs
 		ldr	r0, [r8, #TI_FLAGS]		@ get new tasks TI_FLAGS
 		tst	r0, #_TIF_NEED_RESCHED
@@ -801,7 +801,7 @@ __und_svc:	sub	sp, sp, #S_FRAME_SIZE
 
 		mov	r0, r5				@ unsigned long pc
 		mov	r1, sp				@ struct pt_regs *regs
-		bl	SYMBOL_NAME(do_undefinstr)
+		bl	do_undefinstr
 
 1:		set_cpsr_c r0, #PSR_I_BIT | MODE_SVC
 		ldr	lr, [sp, #S_PSR]		@ Get SVC cpsr
@@ -823,7 +823,7 @@ __pabt_svc:	sub	sp, sp, #S_FRAME_SIZE
 		msr	cpsr_c, r9
 		mov	r0, r2				@ address (pc)
 		mov	r1, sp				@ regs
-		bl	SYMBOL_NAME(do_PrefetchAbort)	@ call abort handler
+		bl	do_PrefetchAbort		@ call abort handler
 		set_cpsr_c r0, #PSR_I_BIT | MODE_SVC
 		ldr	r0, [sp, #S_PSR]
 		msr	spsr, r0
@@ -834,11 +834,11 @@ __pabt_svc:	sub	sp, sp, #S_FRAME_SIZE
 .LCund:		.word	__temp_und
 .LCabt:		.word	__temp_abt
 #ifdef MULTI_ABORT
-.LCprocfns:	.word	SYMBOL_NAME(processor)
+.LCprocfns:	.word	processor
 #endif
-.LCfp:		.word	SYMBOL_NAME(fp_enter)
+.LCfp:		.word	fp_enter
 #ifdef CONFIG_PREEMPT
-.LCirq_stat:	.word	SYMBOL_NAME(irq_stat)
+.LCirq_stat:	.word	irq_stat
 #endif
 
 		irq_prio_table
@@ -867,7 +867,7 @@ __dabt_usr:	sub	sp, sp, #S_FRAME_SIZE		@ Allocate frame size in one go
 		set_cpsr_c r2, #MODE_SVC		@ Enable interrupts
 		mov	r2, sp
 		adrsvc	al, lr, ret_from_exception
-		b	SYMBOL_NAME(do_DataAbort)
+		b	do_DataAbort
 
 		.align	5
 __irq_usr:	sub	sp, sp, #S_FRAME_SIZE
@@ -929,7 +929,7 @@ fpundefinstr:	set_cpsr_c r0, #MODE_SVC		@ Enable interrupts
 		mov	r0, lr
 		mov	r1, sp
 		adrsvc	al, lr, ret_from_exception
-		b	SYMBOL_NAME(do_undefinstr)
+		b	do_undefinstr
 
 		.align	5
 __pabt_usr:	sub	sp, sp, #S_FRAME_SIZE		@ Allocate frame size in one go
@@ -944,7 +944,7 @@ __pabt_usr:	sub	sp, sp, #S_FRAME_SIZE		@ Allocate frame size in one go
 		set_cpsr_c r0, #MODE_SVC		@ Enable interrupts
 		mov	r0, r5				@ address (pc)
 		mov	r1, sp				@ regs
-		bl	SYMBOL_NAME(do_PrefetchAbort)	@ call abort handler
+		bl	do_PrefetchAbort		@ call abort handler
 		/* fall through */
 /*
  * This is the return code to user mode for abort handlers
@@ -1230,9 +1230,9 @@ __temp_abt:	.word	0				@ Saved lr_abt
 		.word	0				@ Saved spsr_abt
 		.word	-1				@ old_r0
 
-		.globl	SYMBOL_NAME(cr_alignment)
-		.globl	SYMBOL_NAME(cr_no_alignment)
-SYMBOL_NAME(cr_alignment):
+		.globl	cr_alignment
+		.globl	cr_no_alignment
+cr_alignment:
 		.space	4
-SYMBOL_NAME(cr_no_alignment):
+cr_no_alignment:
 		.space	4

arch/arm/kernel/entry-common.S

@@ -49,7 +49,7 @@ ret_fast_work:
 	b	work_pending
 
 work_resched:
-	bl	SYMBOL_NAME(schedule)
+	bl	schedule
 /*
  * "slow" syscall return path.  "why" tells us if this was a real syscall.
  */
@@ -70,7 +70,7 @@ no_work_pending:
 __do_notify_resume:
 	mov	r0, sp				@ 'regs'
 	mov	r2, why				@ 'syscall'
-	b	SYMBOL_NAME(do_notify_resume)	@ note the bl above sets lr
+	b	do_notify_resume		@ note the bl above sets lr
 
 /*
  * This is how we return from a fork.
@@ -86,7 +86,7 @@ ENTRY(ret_from_fork)
 	beq	ret_slow_syscall
 	mov	r1, sp
 	mov	r0, #1				@ trace exit [IP = 1]
-	bl	SYMBOL_NAME(syscall_trace)
+	bl	syscall_trace
 	b	ret_slow_syscall
 	
 
@@ -154,8 +154,8 @@ ENTRY(vector_swi)
 2:	mov	why, #0				@ no longer a real syscall
 	cmp	scno, #ARMSWI_OFFSET
 	eor	r0, scno, #OS_NUMBER << 20	@ put OS number back
-	bcs	SYMBOL_NAME(arm_syscall)	
-	b	SYMBOL_NAME(sys_ni_syscall)	@ not private func
+	bcs	arm_syscall	
+	b	sys_ni_syscall			@ not private func
 
 	/*
 	 * This is the really slow path.  We're going to be doing
@@ -164,7 +164,7 @@ ENTRY(vector_swi)
 __sys_trace:
 	add	r1, sp, #S_OFF
 	mov	r0, #0				@ trace entry [IP = 0]
-	bl	SYMBOL_NAME(syscall_trace)
+	bl	syscall_trace
 
 	adrsvc	al, lr, __sys_trace_return	@ return address
 	add	r1, sp, #S_R0 + S_OFF		@ pointer to regs
@@ -177,14 +177,14 @@ __sys_trace_return:
 	str	r0, [sp, #S_R0 + S_OFF]!	@ save returned r0
 	mov	r1, sp
 	mov	r0, #1				@ trace exit [IP = 1]
-	bl	SYMBOL_NAME(syscall_trace)
+	bl	syscall_trace
 	b	ret_slow_syscall
 
 	.align	5
 #ifdef CONFIG_ALIGNMENT_TRAP
 	.type	__cr_alignment, #object
 __cr_alignment:
-	.word	SYMBOL_NAME(cr_alignment)
+	.word	cr_alignment
 #endif
 
 	.type	sys_call_table, #object
@@ -197,7 +197,7 @@ ENTRY(sys_call_table)
 @ r0 = syscall number
 @ r5 = syscall table
 		.type	sys_syscall, #function
-SYMBOL_NAME(sys_syscall):
+sys_syscall:
 		eor	scno, r0, #OS_NUMBER << 20
 		cmp	scno, #NR_syscalls	@ check range
 		stmleia	sp, {r5, r6}		@ shuffle args
@@ -210,35 +210,35 @@ SYMBOL_NAME(sys_syscall):
 
 sys_fork_wrapper:
 		add	r0, sp, #S_OFF
-		b	SYMBOL_NAME(sys_fork)
+		b	sys_fork
 
 sys_vfork_wrapper:
 		add	r0, sp, #S_OFF
-		b	SYMBOL_NAME(sys_vfork)
+		b	sys_vfork
 
 sys_execve_wrapper:
 		add	r3, sp, #S_OFF
-		b	SYMBOL_NAME(sys_execve)
+		b	sys_execve
 
 sys_clone_wapper:
 		add	r2, sp, #S_OFF
-		b	SYMBOL_NAME(sys_clone)
+		b	sys_clone
 
 sys_sigsuspend_wrapper:
 		add	r3, sp, #S_OFF
-		b	SYMBOL_NAME(sys_sigsuspend)
+		b	sys_sigsuspend
 
 sys_rt_sigsuspend_wrapper:
 		add	r2, sp, #S_OFF
-		b	SYMBOL_NAME(sys_rt_sigsuspend)
+		b	sys_rt_sigsuspend
 
 sys_sigreturn_wrapper:
 		add	r0, sp, #S_OFF
-		b	SYMBOL_NAME(sys_sigreturn)
+		b	sys_sigreturn
 
 sys_rt_sigreturn_wrapper:
 		add	r0, sp, #S_OFF
-		b	SYMBOL_NAME(sys_rt_sigreturn)
+		b	sys_rt_sigreturn
 
 sys_sigaltstack_wrapper:
 		ldr	r2, [sp, #S_OFF + S_SP]

arch/arm/kernel/head.S

@@ -35,8 +35,8 @@
 #error TEXTADDR must start at 0xXXXX8000
 #endif
 
-		.globl	SYMBOL_NAME(swapper_pg_dir)
-		.equ	SYMBOL_NAME(swapper_pg_dir), TEXTADDR - 0x4000
+		.globl	swapper_pg_dir
+		.equ	swapper_pg_dir, TEXTADDR - 0x4000
 
 		.macro	pgtbl, reg, rambase
 		adr	\reg, stext
@@ -144,13 +144,13 @@ __entry:
 
 		.type	__switch_data, %object
 __switch_data:	.long	__mmap_switched
-		.long	SYMBOL_NAME(compat)
-		.long	SYMBOL_NAME(__bss_start)
-		.long	SYMBOL_NAME(_end)
-		.long	SYMBOL_NAME(processor_id)
-		.long	SYMBOL_NAME(__machine_arch_type)
-		.long	SYMBOL_NAME(cr_alignment)
-		.long	SYMBOL_NAME(init_thread_union)+8192
+		.long	compat
+		.long	__bss_start
+		.long	_end
+		.long	processor_id
+		.long	__machine_arch_type
+		.long	cr_alignment
+		.long	init_thread_union+8192
 
 		.type	__ret, %function
 __ret:		ldr	lr, __switch_data
@@ -187,7 +187,7 @@ __mmap_switched:
 #endif
 		bic	r2, r0, #2			@ Clear 'A' bit
 		stmia	r8, {r0, r2}			@ Save control register values
-		b	SYMBOL_NAME(start_kernel)
+		b	start_kernel
 
 
 

arch/arm/lib/backtrace.S

@@ -60,7 +60,7 @@ ENTRY(c_backtrace)
 		adr	r0, .Lfe
 		mov	r1, save
 		bic	r2, r2, mask
-		bl	SYMBOL_NAME(printk)	@ print pc and link register
+		bl	printk			@ print pc and link register
 
 		sub	r0, frame, #16
 1002:		ldr	r1, [save, #4]		@ get instruction at function+4
@@ -89,7 +89,7 @@ ENTRY(c_backtrace)
 		.align	0
 1004:		ldr	r0, =.Lbad
 		mov	r1, frame
-		bl	SYMBOL_NAME(printk)
+		bl	printk
 		LOADREGS(fd, sp!, {r4 - r8, pc})
 		.ltorg
 		.previous
@@ -121,12 +121,12 @@ ENTRY(c_backtrace)
 		ldr	r2, [stack], #-4
 		mov	r1, reg
 		adr	r0, .Lfp
-		bl	SYMBOL_NAME(printk)
+		bl	printk
 2:		subs	reg, reg, #1
 		bpl	1b
 		teq	r7, #0
 		adrne	r0, .Lcr
-		blne	SYMBOL_NAME(printk)
+		blne	printk
 		mov	r0, stack
 		LOADREGS(fd, sp!, {instr, reg, stack, r7, pc})
 

arch/arm/lib/delay.S

@@ -11,7 +11,7 @@
 #include <asm/assembler.h>
 		.text
 
-LC0:		.word	SYMBOL_NAME(loops_per_jiffy)
+LC0:		.word	loops_per_jiffy
 
 /*
  * 0 <= r0 <= 2000
@@ -53,5 +53,5 @@ ENTRY(__delay)
 		RETINSTR(movls,pc,lr)
 		subs	r0, r0, #1
 #endif
-		bhi	SYMBOL_NAME(__delay)
+		bhi	__delay
 		RETINSTR(mov,pc,lr)

arch/arm/lib/floppydma.S

@@ -11,16 +11,16 @@
 #include <asm/assembler.h>
 		.text
 
-		.global	SYMBOL_NAME(floppy_fiqin_end)
+		.global	floppy_fiqin_end
 ENTRY(floppy_fiqin_start)
 		subs	r9, r9, #1
 		ldrgtb	r12, [r11, #-4]
 		ldrleb	r12, [r11], #0
 		strb	r12, [r10], #1
 		subs	pc, lr, #4
-SYMBOL_NAME(floppy_fiqin_end):
+floppy_fiqin_end:
 
-		.global	SYMBOL_NAME(floppy_fiqout_end)
+		.global	floppy_fiqout_end
 ENTRY(floppy_fiqout_start)
 		subs	r9, r9, #1
 		ldrgeb	r12, [r10], #1
@@ -29,4 +29,4 @@ ENTRY(floppy_fiqout_start)
 		subles	pc, lr, #4
 		strb	r12, [r11, #-4]
 		subs	pc, lr, #4
-SYMBOL_NAME(floppy_fiqout_end):
+floppy_fiqout_end:

arch/arm/lib/io-acorn.S

@@ -52,7 +52,7 @@ ENTRY(insl)
 ENTRY(outsl)
 		adr	r0, .iosl_warning
 		mov	r1, lr
-		b	SYMBOL_NAME(printk)
+		b	printk
 
 @ Purpose: write a memc register
 @ Proto  : void memc_write(int register, int value);

arch/arm/lib/io-readsw-armv3.S

@@ -14,7 +14,7 @@
 .insw_bad_alignment:
 		adr	r0, .insw_bad_align_msg
 		mov	r2, lr
-		b	SYMBOL_NAME(panic)
+		b	panic
 .insw_bad_align_msg:
 		.asciz	"insw: bad buffer alignment (0x%p, lr=0x%08lX)\n"
 		.align

arch/arm/lib/io-readsw-armv4.S

@@ -14,7 +14,7 @@
 .insw_bad_alignment:
 		adr	r0, .insw_bad_align_msg
 		mov	r2, lr
-		b	SYMBOL_NAME(panic)
+		b	panic
 .insw_bad_align_msg:
 		.asciz	"insw: bad buffer alignment (0x%p, lr=0x%08lX)\n"
 		.align

arch/arm/lib/io-writesw-armv3.S

@@ -14,7 +14,7 @@
 .outsw_bad_alignment:
 		adr	r0, .outsw_bad_align_msg
 		mov	r2, lr
-		b	SYMBOL_NAME(panic)
+		b	panic
 .outsw_bad_align_msg:
 		.asciz	"outsw: bad buffer alignment (0x%p, lr=0x%08lX)\n"
 		.align

arch/arm/lib/io-writesw-armv4.S

@@ -14,7 +14,7 @@
 .outsw_bad_alignment:
 		adr	r0, .outsw_bad_align_msg
 		mov	r2, lr
-		b	SYMBOL_NAME(panic)
+		b	panic
 .outsw_bad_align_msg:
 		.asciz	"outsw: bad buffer alignment (0x%p, lr=0x%08lX)\n"
 		.align

arch/arm/lib/uaccess-armo.S

@@ -15,8 +15,8 @@
 
 		.text
 
-		.globl	SYMBOL_NAME(uaccess_user)
-SYMBOL_NAME(uaccess_user):
+		.globl	uaccess_user
+uaccess_user:
 		.word	uaccess_user_put_byte
 		.word	uaccess_user_get_byte
 		.word	uaccess_user_put_half
@@ -84,8 +84,8 @@ USER(		ldrt	r0, [r0])
 
 
 
-		.globl	SYMBOL_NAME(uaccess_kernel)
-SYMBOL_NAME(uaccess_kernel):
+		.globl	uaccess_kernel
+uaccess_kernel:
 		.word	uaccess_kernel_put_byte
 		.word	uaccess_kernel_get_byte
 		.word	uaccess_kernel_put_half
@@ -154,7 +154,7 @@ uaccess_kernel_get_word:
  */
 uaccess_kernel_copy:
 		stmfd	sp!, {lr}
-		bl	SYMBOL_NAME(memcpy)
+		bl	memcpy
 		mov	r0, #0
 		ldmfd	sp!, {pc}^
 

arch/arm/lib/uaccess.S

@@ -544,7 +544,7 @@ USER(		ldrgtbt	r3, [r1], #1)			@ May fault
 		ldr	r1, [sp], #4			@ unsigned long count
 		subs	r4, r1, r2			@ bytes left to copy
 		movne	r1, r4
-		blne	SYMBOL_NAME(__memzero)
+		blne	__memzero
 		mov	r0, r4
 		LOADREGS(fd,sp!, {r4 - r7, pc})
 		.previous

arch/arm/mach-arc/head.S

@@ -13,8 +13,8 @@
 #include <linux/linkage.h>
 #include <asm/mach-types.h>
 
-		.globl	SYMBOL_NAME(swapper_pg_dir)
-		.equ	SYMBOL_NAME(swapper_pg_dir),	0x0207d000
+		.globl	swapper_pg_dir
+		.equ	swapper_pg_dir,	0x0207d000
 
 /*
  * Entry point.
@@ -38,14 +38,14 @@ __entry:	cmp	pc, #0x02000000
 		str	r0, [r5]
 
 		mov	fp, #0
-		b	SYMBOL_NAME(start_kernel)
+		b	start_kernel
 
-LC0:		.word	SYMBOL_NAME(_stext)
-		.word	SYMBOL_NAME(__bss_start)		@ r2
-		.word	SYMBOL_NAME(_end)			@ r3
-		.word	SYMBOL_NAME(processor_id)		@ r4
-		.word	SYMBOL_NAME(__machine_arch_type)	@ r5
-		.word	SYMBOL_NAME(init_task_union)+8192	@ sp
+LC0:		.word	_stext
+		.word	__bss_start		@ r2
+		.word	_end			@ r3
+		.word	processor_id		@ r4
+		.word	__machine_arch_type	@ r5
+		.word	init_task_union+8192	@ sp
 arm2_id:	.long	0x41560200
 arm250_id:	.long	0x41560250
 		.align

arch/arm/mach-sa1100/sleep.S

@@ -72,12 +72,12 @@ ENTRY(sa1100_cpu_suspend)
 	@ delay 90us and set CPU PLL to lowest speed
 	@ fixes resume problem on high speed SA1110
 	mov	r0, #90
-	bl	SYMBOL_NAME(udelay)
+	bl	udelay
 	ldr	r0, =PPCR
 	mov	r1, #0
 	str	r1, [r0]
 	mov	r0, #90
-	bl	SYMBOL_NAME(udelay)
+	bl	udelay
 
 
 /* setup up register contents for jump to page containing SA1110 SDRAM controller bug fix suspend code

arch/arm/mm/proc-arm2,3.S

@@ -189,7 +189,7 @@ clear_tables:	ldr	r1, _arm3_set_pgd - 4
  * Params  : pgd	New page tables/MEMC mapping
  * Purpose : update MEMC hardware with new mapping
  */
-		.word	SYMBOL_NAME(page_nr)
+		.word	page_nr
 _arm3_set_pgd:	mcr	p15, 0, r1, c1, c0, 0		@ flush cache
 _arm2_set_pgd:	stmfd	sp!, {lr}
 		ldr	r1, _arm3_set_pgd - 4
@@ -285,8 +285,8 @@ _arm3_name:	.asciz	"ARM 3"
  * Purpose : Function pointers used to access above functions - all calls
  *	     come through these
  */
-		.globl	SYMBOL_NAME(arm2_processor_functions)
-SYMBOL_NAME(arm2_processor_functions):
+		.globl	arm2_processor_functions
+arm2_processor_functions:
 		.word	_arm2_3_check_bugs
 		.word	_arm2_proc_init
 		.word	_arm2_proc_fin
@@ -298,8 +298,8 @@ cpu_arm2_info:
 		.long	armvlsi_name
 		.long	_arm2_name
 
-		.globl	SYMBOL_NAME(arm250_processor_functions)
-SYMBOL_NAME(arm250_processor_functions):
+		.globl	arm250_processor_functions
+arm250_processor_functions:
 		.word	_arm2_3_check_bugs
 		.word	_arm2_proc_init
 		.word	_arm2_proc_fin
@@ -311,8 +311,8 @@ cpu_arm250_info:
 		.long	armvlsi_name
 		.long	_arm250_name
 
-		.globl	SYMBOL_NAME(arm3_processor_functions)
-SYMBOL_NAME(arm3_processor_functions):
+		.globl	arm3_processor_functions
+arm3_processor_functions:
 		.word	_arm2_3_check_bugs
 		.word	_arm3_proc_init
 		.word	_arm3_proc_fin
@@ -340,7 +340,7 @@ arm3_elf_name:	.asciz	"v2"
 		.long	arm2_elf_name
 		.long	0
 		.long	cpu_arm2_info
-		.long	SYMBOL_NAME(arm2_processor_functions)
+		.long	arm2_processor_functions
 		.long	0
 		.long	0
 
@@ -352,7 +352,7 @@ arm3_elf_name:	.asciz	"v2"
 		.long	arm3_elf_name
 		.long	0
 		.long	cpu_arm250_info
-		.long	SYMBOL_NAME(arm250_processor_functions)
+		.long	arm250_processor_functions
 		.long	0
 		.long	0
 
@@ -364,7 +364,7 @@ arm3_elf_name:	.asciz	"v2"
 		.long	arm3_elf_name
 		.long	0
 		.long	cpu_arm3_info
-		.long	SYMBOL_NAME(arm3_processor_functions)
+		.long	arm3_processor_functions
 		.long	0
 		.long	0
 

include/asm-arm/proc-armo/locks.h

@@ -28,7 +28,7 @@
 "	orrmi	ip, ip, #0x80000000	@ set N\n" \
 "	teqp	ip, #0\n"			\
 "	movmi	ip, %0\n"			\
-"	blmi	" SYMBOL_NAME_STR(fail)		\
+"	blmi	" #fail				\
 	:					\
 	: "r" (ptr)				\
 	: "ip", "lr", "cc");			\
@@ -50,7 +50,7 @@
 "	teqp	ip, #0\n"			\
 "	movmi	ip, %1\n"			\
 "	movpl	ip, #0\n"			\
-"	blmi	" SYMBOL_NAME_STR(fail) "\n"	\
+"	blmi	" #fail "\n"			\
 "	mov	%0, ip"				\
 	: "=&r" (result)			\
 	: "r" (ptr)				\
@@ -72,7 +72,7 @@
 "	orrle	ip, ip, #0x80000000	@ set N - should this be mi ??? DAG ! \n" \
 "	teqp	ip, #0\n"			\
 "	movmi	ip, %0\n"			\
-"	blmi	" SYMBOL_NAME_STR(wake)		\
+"	blmi	" #wake				\
 	:					\
 	: "r" (ptr)				\
 	: "ip", "lr", "cc");			\
@@ -104,7 +104,7 @@
 " orreq ip, ip, #0x40000000 @ set Z \n"\
 "	teqp	ip, #0\n"			\
 "	movne	ip, %0\n"			\
-"	blne	" SYMBOL_NAME_STR(fail)		\
+"	blne	" #fail				\
 	:					\
 	: "r" (ptr), "I" (RW_LOCK_BIAS)		\
 	: "ip", "lr", "cc");			\
@@ -127,7 +127,7 @@
 " orrcs ip, ip, #0x20000000 @ set C\n" \
 "	teqp	ip, #0\n"			\
 "	movcs	ip, %0\n"			\
-"	blcs	" SYMBOL_NAME_STR(wake)		\
+"	blcs	" #wake				\
 	:					\
 	: "r" (ptr), "I" (RW_LOCK_BIAS)		\
 	: "ip", "lr", "cc");			\
@@ -152,7 +152,7 @@
 " orreq ip, ip, #0x40000000 @ Set Z \n" \
 "	teqp	ip, #0\n"			\
 "	moveq	ip, %0\n"			\
-"	bleq	" SYMBOL_NAME_STR(wake)		\
+"	bleq	" #wake				\
 	:					\
 	: "r" (ptr), "I" (1)			\
 	: "ip", "lr", "cc");			\

include/asm-arm/proc-armv/locks.h

@@ -24,7 +24,7 @@
 "	str	lr, [%0]\n"			\
 "	msr	cpsr_c, ip\n"			\
 "	movmi	ip, %0\n"			\
-"	blmi	" SYMBOL_NAME_STR(fail)		\
+"	blmi	" #fail				\
 	:					\
 	: "r" (ptr), "I" (1)			\
 	: "ip", "lr", "cc");			\
@@ -44,7 +44,7 @@
 "	msr	cpsr_c, ip\n"			\
 "	movmi	ip, %1\n"			\
 "	movpl	ip, #0\n"			\
-"	blmi	" SYMBOL_NAME_STR(fail) "\n"	\
+"	blmi	" #fail "\n"			\
 "	mov	%0, ip"				\
 	: "=&r" (ret)				\
 	: "r" (ptr), "I" (1)			\
@@ -64,7 +64,7 @@
 "	str	lr, [%0]\n"			\
 "	msr	cpsr_c, ip\n"			\
 "	movle	ip, %0\n"			\
-"	blle	" SYMBOL_NAME_STR(wake)		\
+"	blle	" #wake				\
 	:					\
 	: "r" (ptr), "I" (1)			\
 	: "ip", "lr", "cc");			\
@@ -91,7 +91,7 @@
 "	str	lr, [%0]\n"			\
 "	msr	cpsr_c, ip\n"			\
 "	movne	ip, %0\n"			\
-"	blne	" SYMBOL_NAME_STR(fail)		\
+"	blne	" #fail				\
 	:					\
 	: "r" (ptr), "I" (RW_LOCK_BIAS)		\
 	: "ip", "lr", "cc");			\
@@ -109,7 +109,7 @@
 "	str	lr, [%0]\n"			\
 "	msr	cpsr_c, ip\n"			\
 "	movcs	ip, %0\n"			\
-"	blcs	" SYMBOL_NAME_STR(wake)		\
+"	blcs	" #wake				\
 	:					\
 	: "r" (ptr), "I" (RW_LOCK_BIAS)		\
 	: "ip", "lr", "cc");			\
@@ -130,7 +130,7 @@
 "	str	lr, [%0]\n"			\
 "	msr	cpsr_c, ip\n"			\
 "	moveq	ip, %0\n"			\
-"	bleq	" SYMBOL_NAME_STR(wake)		\
+"	bleq	" #wake				\
 	:					\
 	: "r" (ptr), "I" (1)			\
 	: "ip", "lr", "cc");			\