[Patch 2.6.13-rc4-mm1] mips: build fix for spinlock consolidation

[Benoit Boissinot <benoit.boissinot@ens-lyon.org>]

The following patch is needed for mips to compile with
the spinlock consolidation patch (the include of asm-mips/atomic.h
is moved down to avoid circular dependencies).

Signed-off-by: Benoit Boissinot <benoit.boissinot@ens-lyon.org>


--- linux/include/linux/spinlock.h.orig	2005-08-03 20:49:26.000000000 +0200
+++ linux/include/linux/spinlock.h	2005-08-03 20:54:40.000000000 +0200
@@ -55,7 +55,6 @@
 #include <linux/stringify.h>
 
 #include <asm/system.h>
-#include <asm/atomic.h>
 
 /*
  * Must define these before including other files, inline functions need them
@@ -207,6 +206,11 @@ extern int __lockfunc generic__raw_read_
 	1 : ({ local_irq_restore(flags); 0; }); \
 })
 
+/*
+ * Pull the atomic_t declaration:
+ * (asm-mips/atomic.h needs above definitions)
+ */  
+#include <asm/atomic.h>
 /**
  * atomic_dec_and_lock - lock on reaching reference count zero
  * @atomic: the atomic counter
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/