patch-2.3.99-pre7 linux/arch/sparc/lib/bitops.S

• Lines: 98
• Date: Mon May 8 22:00:01 2000
• Orig file: v2.3.99-pre6/linux/arch/sparc/lib/bitops.S
• Orig date: Wed Apr 26 16:34:07 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/arch/sparc/lib/bitops.S linux/arch/sparc/lib/bitops.S
@@ -3,6 +3,7 @@
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
  */
 
+#include <linux/config.h>
 #include <asm/cprefix.h>
 #include <asm/ptrace.h>
 #include <asm/psr.h>
@@ -27,7 +28,7 @@
 	or	%g3, PSR_PIL, %g5
 	wr	%g5, 0x0, %psr
 	nop; nop; nop
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	set	C_LABEL(bitops_spinlock), %g5
 2:	ldstub	[%g5], %g7		! Spin on the byte lock for SMP.
 	orcc	%g7, 0x0, %g0		! Did we get it?
@@ -36,7 +37,7 @@
 	 ld	[%g1], %g7
 	or	%g7, %g2, %g5
 	and	%g7, %g2, %g2
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	st	%g5, [%g1]
 	set	C_LABEL(bitops_spinlock), %g5
 	stb	%g0, [%g5]
@@ -56,7 +57,7 @@
 	or	%g3, PSR_PIL, %g5
 	wr	%g5, 0x0, %psr
 	nop; nop; nop
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	set	C_LABEL(bitops_spinlock), %g5
 2:	ldstub	[%g5], %g7		! Spin on the byte lock for SMP.
 	orcc	%g7, 0x0, %g0		! Did we get it?
@@ -65,7 +66,7 @@
 	 ld	[%g1], %g7
 	andn	%g7, %g2, %g5
 	and	%g7, %g2, %g2
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	st	%g5, [%g1]
 	set	C_LABEL(bitops_spinlock), %g5
 	stb	%g0, [%g5]
@@ -85,7 +86,7 @@
 	or	%g3, PSR_PIL, %g5
 	wr	%g5, 0x0, %psr
 	nop; nop; nop
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	set	C_LABEL(bitops_spinlock), %g5
 2:	ldstub	[%g5], %g7		! Spin on the byte lock for SMP.
 	orcc	%g7, 0x0, %g0		! Did we get it?
@@ -94,7 +95,7 @@
 	 ld	[%g1], %g7
 	xor	%g7, %g2, %g5
 	and	%g7, %g2, %g2
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	st	%g5, [%g1]
 	set	C_LABEL(bitops_spinlock), %g5
 	stb	%g0, [%g5]
@@ -114,7 +115,7 @@
 	or	%g3, PSR_PIL, %g5
 	wr	%g5, 0x0, %psr
 	nop; nop; nop
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	set	C_LABEL(bitops_spinlock), %g5
 2:	ldstub	[%g5], %g7		! Spin on the byte lock for SMP.
 	orcc	%g7, 0x0, %g0		! Did we get it?
@@ -123,7 +124,7 @@
 	 ldub	[%g1], %g7
 	or	%g7, %g2, %g5
 	and	%g7, %g2, %g2
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	stb	%g5, [%g1]
 	set	C_LABEL(bitops_spinlock), %g5
 	stb	%g0, [%g5]
@@ -142,7 +143,7 @@
 	or	%g3, PSR_PIL, %g5
 	wr	%g5, 0x0, %psr
 	nop; nop; nop
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	set	C_LABEL(bitops_spinlock), %g5
 2:	ldstub	[%g5], %g7		! Spin on the byte lock for SMP.
 	orcc	%g7, 0x0, %g0		! Did we get it?
@@ -151,7 +152,7 @@
 	 ldub	[%g1], %g7
 	andn	%g7, %g2, %g5
 	and	%g7, %g2, %g2
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	stb	%g5, [%g1]
 	set	C_LABEL(bitops_spinlock), %g5
 	stb	%g0, [%g5]