From 6f1278414584a777ceba56bbb0817ece8a590393 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@mcmartin.ca>
Date: Thu, 2 Jul 2009 13:10:29 -0400
Subject: [PATCH] --- yaml --- r: 154899 b: refs/heads/master c:
 64daa4435a40aa1b7d0ece598ae783b89dda13ee h: refs/heads/master i:   154897:
 8022d4464e1442e75582418161dba505e9c998b4   154895:
 3aa02e9388821e149b36e3879797d44ae34af3ba v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/parisc/Kconfig              | 1 +
 trunk/arch/parisc/include/asm/atomic.h | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 549df9790dfa..eebf83014537 100644
--- 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
index c38bbc7af793..06f8d5b5b0f9 100644
--- 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
index 82e9688f658c..8bc9e96699b2 100644
--- 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>