[kernel] r5823 - in dists/trunk/linux-2.6/debian/patches: . series

[Bastian Blank]

Author: waldi
Date: Sat Feb 11 21:56:28 2006
New Revision: 5823

Added:
   dists/trunk/linux-2.6/debian/patches/git-extract-s390.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/0experimental.1
Log:
debian/patches/series/0experimental.1, debian/patches/git-extract-s390.patch:
Add temporary build fixes.


Added: dists/trunk/linux-2.6/debian/patches/git-extract-s390.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/git-extract-s390.patch	Sat Feb 11 21:56:28 2006
@@ -0,0 +1,79 @@
+[PATCH] s390: compile fix: missing defines in asm-s390/io.h
+
+Compile fix: add missing __raw_read* and __raw_write* defines to
+include/asm-s390/io.h.
+These are mandatory since patch c27a0d75b33c030965cc97d3d7f571107a673fb4
+was merged.
+
+Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+Signed-off-by: Linus Torvalds <torvalds at osdl.org>
+
+---
+commit 6ff290a0c0dec40eb6f80efbb0ac88f518bbb2a7
+tree 2104a0923095681204896057429afabd3e700314
+parent 6d7bfd14e593455a0801c62db86f82912c52c3a1
+author Heiko Carstens <heiko.carstens at de.ibm.com> Fri, 03 Feb 2006 03:03:51 -0800
+committer Linus Torvalds <torvalds at g5.osdl.org> Fri, 03 Feb 2006 08:32:01 -0800
+
+ include/asm-s390/io.h |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/include/asm-s390/io.h b/include/asm-s390/io.h
+index 71f55eb..b05825d 100644
+--- a/include/asm-s390/io.h
++++ b/include/asm-s390/io.h
+@@ -90,10 +90,16 @@ extern void iounmap(void *addr);
+ #define readb_relaxed(addr) readb(addr)
+ #define readw_relaxed(addr) readw(addr)
+ #define readl_relaxed(addr) readl(addr)
++#define __raw_readb readb
++#define __raw_readw readw
++#define __raw_readl readl
+ 
+ #define writeb(b,addr) (*(volatile unsigned char *) __io_virt(addr) = (b))
+ #define writew(b,addr) (*(volatile unsigned short *) __io_virt(addr) = (b))
+ #define writel(b,addr) (*(volatile unsigned int *) __io_virt(addr) = (b))
++#define __raw_writeb writeb
++#define __raw_writew writew
++#define __raw_writel writel
+ 
+ #define memset_io(a,b,c)        memset(__io_virt(a),(b),(c))
+ #define memcpy_fromio(a,b,c)    memcpy((a),__io_virt(b),(c))
+
+
+---
+
+
+[PATCH] Fix s390 build failure.
+
+arch/s390/kernel/compat_signal.c:199: error: conflicting types for 'do_sigaction'
+include/linux/sched.h:1115: error: previous declaration of 'do_sigaction' was here
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+Signed-off-by: Linus Torvalds <torvalds at osdl.org>
+
+---
+commit 21b4da78c941f292f6daf87abb562d6285216e51
+tree 705d38a01494000d3f7a1071f90870100730708a
+parent 418aade459f03318defd18ef0b11981a63bd81b0
+author Dave Jones <davej at redhat.com> Fri, 10 Feb 2006 16:27:11 -0500
+committer Linus Torvalds <torvalds at g5.osdl.org> Fri, 10 Feb 2006 13:43:59 -0800
+
+ arch/s390/kernel/compat_signal.c |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
+index ef70669..5291b5f 100644
+--- a/arch/s390/kernel/compat_signal.c
++++ b/arch/s390/kernel/compat_signal.c
+@@ -195,9 +195,6 @@ sys32_sigaction(int sig, const struct ol
+ 	return ret;
+ }
+ 
+-int
+-do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact);
+-
+ asmlinkage long
+ sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,
+ 	   struct sigaction32 __user *oact,  size_t sigsetsize)

Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1	Sat Feb 11 21:56:28 2006
@@ -17,3 +17,4 @@
 #FIXME + powerpc-apus.patch
 + sparc64-hme-lockup.patch
 + sparc64-atyfb-xl-gr.patch
++ git-extract-s390.patch