From ef951cd9a1bff3b5b74243b16003620480f3b3f8 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Wed, 9 Jun 2010 22:16:05 +0000
Subject: [PATCH] ipr: add writeq definition if needed (Closes: #584840)

svn path=/dists/trunk/linux-2.6/; revision=15846
---
 debian/changelog                              |  7 ++++
 .../ipr-add-writeq-definition-if-needed.patch | 34 +++++++++++++++++++
 debian/patches/series/1~experimental.3        |  1 +
 3 files changed, 42 insertions(+)
 create mode 100644 debian/patches/bugfix/all/ipr-add-writeq-definition-if-needed.patch
 create mode 100644 debian/patches/series/1~experimental.3

diff --git a/debian/changelog b/debian/changelog
index 60406c7ae..0cc567484 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.34-1~experimental.3) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * ipr: add writeq definition if needed (Closes: #584840)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Wed, 09 Jun 2010 23:03:38 +0100
+
 linux-2.6 (2.6.34-1~experimental.2) experimental; urgency=low
 
   [ Ben Hutchings ]
diff --git a/debian/patches/bugfix/all/ipr-add-writeq-definition-if-needed.patch b/debian/patches/bugfix/all/ipr-add-writeq-definition-if-needed.patch
new file mode 100644
index 000000000..14f4118c4
--- /dev/null
+++ b/debian/patches/bugfix/all/ipr-add-writeq-definition-if-needed.patch
@@ -0,0 +1,34 @@
+From: Brian King <brking@linux.vnet.ibm.com>
+Subject: [PATCH 1/1] ipr: add writeq definition if needed
+Date: Wed, 09 Jun 2010 08:24:55 -0700
+
+Compiling the driver will fail on 32 bit powerpc and other
+architectures where writeq is not defined.  This patch adds a
+definition for writeq.
+
+Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
+Acked-by: Brian King <brking@linux.vnet.ibm.com>
+---
+
+ drivers/scsi/ipr.h |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+Index: b/drivers/scsi/ipr.h
+===================================================================
+--- a/drivers/scsi/ipr.h	2010-06-08 10:06:48.000000000 -0700
++++ b/drivers/scsi/ipr.h	2010-06-08 15:14:42.000000000 -0700
+@@ -1860,4 +1860,12 @@ static inline int ipr_sdt_is_fmt2(u32 sd
+ 	return 0;
+ }
+
++#ifndef writeq
++static inline void writeq(u64 val, void __iomem *addr)
++{
++	writel(((u32) (val >> 32)), addr);
++	writel(((u32) (val)), (addr + 4));
++}
+ #endif
++
++#endif /* _IPR_H */
+
+
diff --git a/debian/patches/series/1~experimental.3 b/debian/patches/series/1~experimental.3
new file mode 100644
index 000000000..ed01602bc
--- /dev/null
+++ b/debian/patches/series/1~experimental.3
@@ -0,0 +1 @@
++ bugfix/all/ipr-add-writeq-definition-if-needed.patch