Merge kernel.bkbits.net:/home/wesolows/sparc32-2.6

into kernel.bkbits.net:/home/davem/sparc-2.6

5 files changed, 23 insertions, 49 deletions

diff --git a/include/asm-sparc/asmmacro.h b/include/asm-sparc/asmmacro.h
index d1441ec0a531..19d896df61d5 100644
--- a/include/asm-sparc/asmmacro.h
+++ b/include/asm-sparc/asmmacro.h
@@ -26,17 +26,17 @@
 
 #define GET_PROCESSOR_MID(reg, tmp) \
 	rd	%tbr, %reg; \
-	sethi	%hi(C_LABEL(mid_xlate)), %tmp; \
+	sethi	%hi(mid_xlate), %tmp; \
 	srl	%reg, 12, %reg; \
-	or	%tmp, %lo(C_LABEL(mid_xlate)), %tmp; \
+	or	%tmp, %lo(mid_xlate), %tmp; \
 	and	%reg, 3, %reg; \
 	ldub	[%tmp + %reg], %reg;
 
 #define GET_PROCESSOR_OFFSET(reg, tmp) \
 	GET_PROCESSOR_ID(reg) \
-	sethi	%hi(C_LABEL(cpu_offset)), %tmp; \
+	sethi	%hi(cpu_offset), %tmp; \
 	sll	%reg, 2, %reg; \
-	or	%tmp, %lo(C_LABEL(cpu_offset)), %tmp; \
+	or	%tmp, %lo(cpu_offset), %tmp; \
 	ld	[%tmp + %reg], %reg;
 
 /* All trap entry points _must_ begin with this macro or else you
diff --git a/include/asm-sparc/checksum.h b/include/asm-sparc/checksum.h
index 9dd5a7bfcb87..ea48d2ea78cb 100644
--- a/include/asm-sparc/checksum.h
+++ b/include/asm-sparc/checksum.h
@@ -18,7 +18,6 @@
  
 #include <linux/in6.h>
 #include <asm/uaccess.h>
-#include <asm/cprefix.h>
 
 /* computes the checksum of a memory block at buff, length len,
  * and adds in "sum" (32-bit)
@@ -51,7 +50,7 @@ csum_partial_copy_nocheck (const char *src, char *dst, int len,
 	register int l asm("g1") = len;
 
 	__asm__ __volatile__ (
-		"call " C_LABEL_STR(__csum_partial_copy_sparc_generic) "\n\t"
+		"call __csum_partial_copy_sparc_generic\n\t"
 		" mov %6, %%g7\n"
 	: "=&r" (ret), "=&r" (d), "=&r" (l)
 	: "0" (ret), "1" (d), "2" (l), "r" (sum)
@@ -81,7 +80,7 @@ csum_partial_copy_from_user(const char *src, char *dst, int len,
 		".word 1f,2\n\t"
 		".previous\n"
 		"1:\n\t"
-		"call " C_LABEL_STR(__csum_partial_copy_sparc_generic) "\n\t"
+		"call __csum_partial_copy_sparc_generic\n\t"
 		" st %8, [%%sp + 64]\n"
 		: "=&r" (ret), "=&r" (d), "=&r" (l), "=&r" (s)
 		: "0" (ret), "1" (d), "2" (l), "3" (s), "r" (err)
@@ -110,7 +109,7 @@ csum_partial_copy_to_user(const char *src, char *dst, int len,
 		".word 1f,1\n\t"
 		".previous\n"
 		"1:\n\t"
-		"call " C_LABEL_STR(__csum_partial_copy_sparc_generic) "\n\t"
+		"call __csum_partial_copy_sparc_generic\n\t"
 		" st %8, [%%sp + 64]\n"
 		: "=&r" (ret), "=&r" (d), "=&r" (l), "=&r" (s)
 		: "0" (ret), "1" (d), "2" (l), "3" (s), "r" (err)
diff --git a/include/asm-sparc/cprefix.h b/include/asm-sparc/cprefix.h
deleted file mode 100644
index 42e7bd577ed3..000000000000
--- a/include/asm-sparc/cprefix.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* cprefix.h:  This file is included by assembly source which needs
- *             to know what the c-label prefixes are. The newer versions
- *	       of cpp that come with gcc predefine such things to help
- *	       us out. The reason this stuff is needed is to make
- *	       solaris compiles of the kernel work.
- *
- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
- */
-#ifndef __SPARC_CPREFIX_H
-#define __SPARC_CPREFIX_H
-
-#if defined(__svr4__) || defined(__ELF__)
-#define C_LABEL_PREFIX
-#define C_LABEL_STR(name) #name
-#else
-#define C_LABEL_PREFIX _
-#define C_LABEL_STR(name) "_" #name
-#endif
-
-#define CONCAT(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a##b
-
-#define C_LABEL(name) CONCAT(C_LABEL_PREFIX, name)
-
-#endif /* !(__SPARC_CPREFIX_H) */
diff --git a/include/asm-sparc/head.h b/include/asm-sparc/head.h
index f781635d6840..1a03c28da92d 100644
--- a/include/asm-sparc/head.h
+++ b/include/asm-sparc/head.h
@@ -22,8 +22,8 @@
 /* Data/text faults. Defaults to sun4c version at boot time. */
 #define SPARC_TFAULT rd %psr, %l0; rd %wim, %l3; b sun4c_fault; mov 1, %l7;
 #define SPARC_DFAULT rd %psr, %l0; rd %wim, %l3; b sun4c_fault; mov 0, %l7;
-#define SRMMU_TFAULT rd %psr, %l0; rd %wim, %l3; b C_LABEL(srmmu_fault); mov 1, %l7;
-#define SRMMU_DFAULT rd %psr, %l0; rd %wim, %l3; b C_LABEL(srmmu_fault); mov 0, %l7;
+#define SRMMU_TFAULT rd %psr, %l0; rd %wim, %l3; b srmmu_fault; mov 1, %l7;
+#define SRMMU_DFAULT rd %psr, %l0; rd %wim, %l3; b srmmu_fault; mov 0, %l7;
 
 /* This is for traps we should NEVER get. */
 #define BAD_TRAP(num) \
@@ -41,17 +41,17 @@
 
 /* Software trap for Linux system calls. */
 #define LINUX_SYSCALL_TRAP \
-        sethi %hi(C_LABEL(sys_call_table)), %l7; \
-        or %l7, %lo(C_LABEL(sys_call_table)), %l7; \
+        sethi %hi(sys_call_table), %l7; \
+        or %l7, %lo(sys_call_table), %l7; \
         b linux_sparc_syscall; \
         rd %psr, %l0;
 
 /* Software trap for SunOS4.1.x system calls. */
 #define SUNOS_SYSCALL_TRAP \
         rd %psr, %l0; \
-        sethi %hi(C_LABEL(sunos_sys_table)), %l7; \
+        sethi %hi(sunos_sys_table), %l7; \
         b linux_sparc_syscall; \
-        or %l7, %lo(C_LABEL(sunos_sys_table)), %l7;
+        or %l7, %lo(sunos_sys_table), %l7;
 
 #define SUNOS_NO_SYSCALL_TRAP \
         b sunos_syscall; \
@@ -80,8 +80,8 @@
 
 /* Software trap for Sparc-netbsd system calls. */
 #define NETBSD_SYSCALL_TRAP \
-        sethi %hi(C_LABEL(sys_call_table)), %l7; \
-        or %l7, %lo(C_LABEL(sys_call_table)), %l7; \
+        sethi %hi(sys_call_table), %l7; \
+        or %l7, %lo(sys_call_table), %l7; \
         b bsd_syscall; \
         rd %psr, %l0;
 
diff --git a/include/asm-sparc/winmacro.h b/include/asm-sparc/winmacro.h
index 649081568961..cb80840b111e 100644
--- a/include/asm-sparc/winmacro.h
+++ b/include/asm-sparc/winmacro.h
@@ -106,9 +106,9 @@
 #ifdef CONFIG_SMP
 #define LOAD_CURRENT4M(dest_reg, idreg) \
         rd       %tbr, %idreg; \
-	sethi    %hi(C_LABEL(current_set)), %dest_reg; \
+	sethi    %hi(current_set), %dest_reg; \
         srl      %idreg, 10, %idreg; \
-	or       %dest_reg, %lo(C_LABEL(current_set)), %dest_reg; \
+	or       %dest_reg, %lo(current_set), %dest_reg; \
 	and      %idreg, 0xc, %idreg; \
 	ld       [%idreg + %dest_reg], %dest_reg;
 
@@ -119,15 +119,15 @@
 /* Blackbox - take care with this... - check smp4m and smp4d before changing this. */
 #define LOAD_CURRENT(dest_reg, idreg) 					\
 	sethi	 %hi(___b_load_current), %idreg;			\
-	sethi    %hi(C_LABEL(current_set)), %dest_reg; 			\
-	sethi    %hi(C_LABEL(boot_cpu_id4)), %idreg; 			\
-	or       %dest_reg, %lo(C_LABEL(current_set)), %dest_reg; 	\
-	ldub	 [%idreg + %lo(C_LABEL(boot_cpu_id4))], %idreg;		\
+	sethi    %hi(current_set), %dest_reg; 			\
+	sethi    %hi(boot_cpu_id4), %idreg; 			\
+	or       %dest_reg, %lo(current_set), %dest_reg; 	\
+	ldub	 [%idreg + %lo(boot_cpu_id4)], %idreg;		\
 	ld       [%idreg + %dest_reg], %dest_reg;
 #else
 #define LOAD_CURRENT(dest_reg, idreg) \
-        sethi    %hi(C_LABEL(current_set)), %idreg; \
-        ld       [%idreg + %lo(C_LABEL(current_set))], %dest_reg;
+        sethi    %hi(current_set), %idreg; \
+        ld       [%idreg + %lo(current_set)], %dest_reg;
 #endif
 
 #endif /* !(_SPARC_WINMACRO_H) */