Merge with Linux 2.4.0-test9. Please check DECstation, I had a number

of rejects to fixup while integrating Linus patches.  I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages.  I commit this anyway
since I found that the last CVS versions had the same problem.

1 files changed, 3 insertions, 10 deletions

diff --git a/include/asm-sparc/atomic.h b/include/asm-sparc/atomic.h
index dc29a13cd..4a55a8929 100644
--- a/include/asm-sparc/atomic.h
+++ b/include/asm-sparc/atomic.h
@@ -8,21 +8,12 @@
 
 #include <linux/config.h>
 
-#ifdef CONFIG_SMP
-/* This is a temporary measure. -DaveM */
 typedef struct { volatile int counter; } atomic_t;
-#define ATOMIC_INIT(i)	{ (i << 8) }
-#else
-typedef struct { int counter; } atomic_t;
-#define ATOMIC_INIT(i)  { (i) }
-#endif
 
 #ifdef __KERNEL__
-#include <asm/system.h>
-#include <asm/psr.h>
-
 #ifndef CONFIG_SMP
 
+#define ATOMIC_INIT(i)  { (i) }
 #define atomic_read(v)          ((v)->counter)
 #define atomic_set(v, i)        (((v)->counter) = i)
 
@@ -41,6 +32,8 @@ typedef struct { int counter; } atomic_t;
  *	 31                          8 7      0
  */
 
+#define ATOMIC_INIT(i)	{ (i << 8) }
+
 static __inline__ int atomic_read(atomic_t *v)
 {
 	int ret = v->counter;