Removing SYMBOL_NAME part 6

diff -urN linux-2.5.11/drivers/pnp/pnpbios_core.c linux/drivers/pnp/pnpbios_core.c
@@ -113,12 +113,12 @@
 __asm__(
 	".text			\n"
 	__ALIGN_STR "\n"
-	SYMBOL_NAME_STR(pnp_bios_callfunc) ":\n"
+	"pnp_bios_callfunc:\n"
 	"	pushl %edx	\n"
 	"	pushl %ecx	\n"
 	"	pushl %ebx	\n"
 	"	pushl %eax	\n"
-	"	lcallw " SYMBOL_NAME_STR(pnp_bios_callpoint) "\n"
+	"	lcallw pnp_bios_callpoint\n"
 	"	addl $16, %esp	\n"
 	"	lret		\n"
 	".previous		\n"

diff -urN linux-2.5.11/drivers/scsi/seagate.c linux/drivers/scsi/seagate.c
@@ -1285,8 +1285,8 @@
 							/* Test for any data here at all. */
 							"orl %%ecx, %%ecx\n\t"
 							"jz 2f\n\t" "cld\n\t"
-/*                    "movl " SYMBOL_NAME_STR(st0x_cr_sr) ", %%ebx\n\t"  */
-/*                    "movl " SYMBOL_NAME_STR(st0x_dr) ", %%edi\n\t"  */
+/*                    "movl st0x_cr_sr, %%ebx\n\t"  */
+/*                    "movl st0x_dr, %%edi\n\t"  */
 							"1:\t"
 							"movb (%%ebx), %%al\n\t"
 							/* Test for BSY */

@@ -1461,8 +1461,8 @@
 							/* Test for room to read */
 							"orl %%ecx, %%ecx\n\t"
 							"jz 2f\n\t" "cld\n\t"
-/*                "movl " SYMBOL_NAME_STR(st0x_cr_sr) ", %%esi\n\t"  */
-/*                "movl " SYMBOL_NAME_STR(st0x_dr) ", %%ebx\n\t"  */
+/*                "movl st0x_cr_sr, %%esi\n\t"  */
+/*                "movl st0x_dr, %%ebx\n\t"  */
 							"1:\t"
 							"movb (%%esi), %%al\n\t"
 							/* Test for BSY */

diff -urN linux-2.5.11/include/linux/linkage.h linux/include/linux/linkage.h
@@ -17,14 +17,6 @@
 #define asmlinkage CPP_ASMLINKAGE
 #endif
 
-#define SYMBOL_NAME_STR(X) #X
-#define SYMBOL_NAME(X) X
-#ifdef __STDC__
-#define SYMBOL_NAME_LABEL(X) X##:
-#else
-#define SYMBOL_NAME_LABEL(X) X/**/:
-#endif
-
 #ifdef __arm__
 #define __ALIGN .align 0
 #define __ALIGN_STR ".align 0"

@@ -54,9 +46,9 @@
 #define ALIGN_STR __ALIGN_STR
 
 #define ENTRY(name) \
-  .globl SYMBOL_NAME(name); \
+  .globl name; \
   ALIGN; \
-  SYMBOL_NAME_LABEL(name)
+  name:
 
 #endif
 

diff -urN linux-2.5.11/include/net/profile.h linux/include/net/profile.h
@@ -44,7 +44,7 @@
 			      "sbbl %3,%1\n\t" 
 			      "addl %4,%0\n\t" 
 			      "adcl %5,%1\n\t" 
-			      "subl " SYMBOL_NAME_STR(net_profile_adjust) "+4,%0\n\t" 
+			      "subl net_profile_adjust+4,%0\n\t" 
 			      "sbbl $0,%1\n\t" 
 			      : "=r" (acc->tv_usec), "=r" (acc->tv_sec)
 			      : "g" (entered->tv_usec), "g" (entered->tv_sec),