---

yaml --- r: 154899 b: refs/heads/master c: 64daa44 h: refs/heads/master i: 154897: 8022d44 154895: 3aa02e9 v: v3
git-mirror · Jul 3, 2009 · 6f12784 · 6f12784
1 parent f5377d0
commit 6f12784
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c5cb79198d80eaea273f3e91cb418d559f13462
+refs/heads/master: 64daa4435a40aa1b7d0ece598ae783b89dda13ee
diff --git a/trunk/arch/parisc/Kconfig b/trunk/arch/parisc/Kconfig
@@ -17,6 +17,7 @@ config PARISC
 	select INIT_ALL_POSSIBLE
 	select BUG
 	select HAVE_PERF_COUNTERS
+	select GENERIC_ATOMIC64 if !64BIT
 	help
 	  The PA-RISC microprocessor is designed by Hewlett-Packard and used
 	  in many of their workstations & servers (HP9000 700 and 800 series,

diff --git a/trunk/arch/parisc/include/asm/atomic.h b/trunk/arch/parisc/include/asm/atomic.h
@@ -336,7 +336,11 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
 
 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
 
-#endif /* CONFIG_64BIT */
+#else /* CONFIG_64BIT */
+
+#include <asm-generic/atomic64.h>
+
+#endif /* !CONFIG_64BIT */
 
 #include <asm-generic/atomic-long.h>