git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[pandora-kernel.git]
/
arch
/
mips
/
include
/
asm
/
atomic.h
diff --git
a/arch/mips/include/asm/atomic.h
b/arch/mips/include/asm/atomic.h
index
c63c56b
..
47d87da
100644
(file)
--- a/
arch/mips/include/asm/atomic.h
+++ b/
arch/mips/include/asm/atomic.h
@@
-782,6
+782,10
@@
static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
*/
#define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)
+#else /* !CONFIG_64BIT */
+
+#include <asm-generic/atomic64.h>
+
#endif /* CONFIG_64BIT */
/*