[kernel] r15846 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Wed Jun  9 22:16:05 2010
New Revision: 15846

Log:
ipr: add writeq definition if needed (Closes: #584840)

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/ipr-add-writeq-definition-if-needed.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.3
Modified:
   dists/trunk/linux-2.6/debian/changelog

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Jun  8 16:37:12 2010	(r15845)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Jun  9 22:16:05 2010	(r15846)
@@ -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 at 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 ]

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/ipr-add-writeq-definition-if-needed.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/ipr-add-writeq-definition-if-needed.patch	Wed Jun  9 22:16:05 2010	(r15846)
@@ -0,0 +1,34 @@
+From: Brian King <brking at 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 at linux.vnet.ibm.com>
+Acked-by: Brian King <brking at 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 */
+
+

Added: dists/trunk/linux-2.6/debian/patches/series/1~experimental.3
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.3	Wed Jun  9 22:16:05 2010	(r15846)
@@ -0,0 +1 @@
++ bugfix/all/ipr-add-writeq-definition-if-needed.patch