r2283 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches patches/series

[maks andries]

Author: maks-guest
Date: 2005-01-12 19:54:32 +0100 (Wed, 12 Jan 2005)
New Revision: 2283

Added:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/alpha-io-typo.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4
Log:
fix wierd alpha io errors due to typo.


Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-01-12 16:57:08 UTC (rev 2282)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-01-12 18:54:32 UTC (rev 2283)
@@ -25,6 +25,8 @@
   * Fix modular-vesafb.dpatch to not break the non-modular case
     (Christoph Hellwig) (closes: #289610).
 
+  * Fix weird alpha IO failures due to typo. (Maximilian Attems)
+
  -- Sven Luther <luther@debian.org>  Mon, 10 Jan 2005 18:06:29 +0100
 
 kernel-source-2.6.10 (2.6.10-3) unstable; urgency=low

Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/alpha-io-typo.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/alpha-io-typo.dpatch	2005-01-12 16:57:08 UTC (rev 2282)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/alpha-io-typo.dpatch	2005-01-12 18:54:32 UTC (rev 2283)
@@ -0,0 +1,48 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] drivers/acpi/ibm_acpi.o .init.text refers to .exit.text
+## DP: Patch author: Richard Henderson <rth@twiddle.net>
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/01/12 08:48:35-08:00 ink@jurassic.park.msu.ru 
+#   [PATCH] Alpha: typos in io_trivial.h
+#   
+#   This apparently explains some weird IO failures reported in last two months.
+#   Only non-bwx (including generic) kernels were affected.
+#   
+#   Acked-by: Richard Henderson <rth@twiddle.net>
+#   Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+# 
+# include/asm-alpha/io_trivial.h
+#   2005/01/11 17:47:26-08:00 ink@jurassic.park.msu.ru +2 -2
+#   Alpha: typos in io_trivial.h
+# 
+diff -Nru a/include/asm-alpha/io_trivial.h b/include/asm-alpha/io_trivial.h
+--- a/include/asm-alpha/io_trivial.h	2005-01-12 10:55:52 -08:00
++++ b/include/asm-alpha/io_trivial.h	2005-01-12 10:55:52 -08:00
+@@ -26,7 +26,7 @@
+ __EXTERN_INLINE void
+ IO_CONCAT(__IO_PREFIX,iowrite16)(u16 b, void __iomem *a)
+ {
+-	__kernel_stb(b, *(volatile u16 __force *)a);
++	__kernel_stw(b, *(volatile u16 __force *)a);
+ }
+ #endif
+ 
+@@ -66,7 +66,7 @@
+ __EXTERN_INLINE void
+ IO_CONCAT(__IO_PREFIX,writew)(u16 b, volatile void __iomem *a)
+ {
+-	__kernel_stb(b, *(volatile u16 __force *)a);
++	__kernel_stw(b, *(volatile u16 __force *)a);
+ }
+ #elif IO_CONCAT(__IO_PREFIX,trivial_rw_bw) == 2
+ __EXTERN_INLINE u8

Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4	2005-01-12 16:57:08 UTC (rev 2282)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4	2005-01-12 18:54:32 UTC (rev 2283)
@@ -12,3 +12,4 @@
 + alsa-emu10k1-ioctl-fix.dpatch
 - modular-vesafb.dpatch
 + modular-vesafb-3.dpatch
++ alpha-io-typo.dpatch