Update s390 klibc build fix to match Linus' tree

diff --git a/queue/s390-klibc-build-fix-for-2.6.15.patch b/queue/s390-klibc-build-fix-for-2.6.15.patch
index 7a72a43817c045bc4ea765a58be2a13844b9ec24..8c4616d9d03896c9d7300564781c94ee3066a8f0 100644 (file)
--- a/queue/s390-klibc-build-fix-for-2.6.15.patch
+++ b/queue/s390-klibc-build-fix-for-2.6.15.patch
@@ -4,40 +4,50 @@ From: maximilian attems <maks@sternwelten.at>
 To: schwidefsky@de.ibm.com
 Message-ID: <20060201104110.GA5584@nancy>
 Content-Disposition: inline
-Cc: Bastian Blank <waldi@debian.org>, klibc@zytor.com, stable@kernel.org,
-        linux-390@vm.marist.edu
-Subject: s390 klibc build fix for 2.6.15
+Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
+Subject: [PATCH] s390: add #ifdef __KERNEL__ to asm-s390/setup.h
 
-klibc doesn't currently build on s390 since
-commit 1e8e338325fa0f2bd5c1c800086e900cf188d2cd
+From: Heiko Carstens <heiko.carstens@de.ibm.com>
 
-belows patch adds some kernel ifdef for the newly added section.
+Based on a patch from Maximilian Attems <maks@sternwelten.at> .  Nothing in
+asm-s390/setup.h is of interest for user space.
 
-Signed-off-by: maximilian attems <maks@sternwelten.at>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
-
 ---
- include/asm-s390/setup.h |    4 ++++
- 1 file changed, 4 insertions(+)
 
---- linux-2.6.15.3.orig/include/asm-s390/setup.h
-+++ linux-2.6.15.3/include/asm-s390/setup.h
-@@ -67,6 +67,8 @@ extern unsigned int console_irq;
- #define SET_CONSOLE_3215      do { console_mode = 2; } while (0)
- #define SET_CONSOLE_3270      do { console_mode = 3; } while (0)
+ include/asm-s390/setup.h |   10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+--- linux-2.6.15.4.orig/include/asm-s390/setup.h
++++ linux-2.6.15.4/include/asm-s390/setup.h
+@@ -8,6 +8,8 @@
+ #ifndef _ASM_S390_SETUP_H
+ #define _ASM_S390_SETUP_H
  
 +#ifdef __KERNEL__
 +
- struct ipl_list_header {
-       u32 length;
-       u8  reserved[3];
-@@ -114,6 +116,8 @@ extern u16 ipl_devno;
+ #include <asm/types.h>
+ 
+ #define PARMAREA              0x10400
+@@ -114,7 +116,7 @@ extern u16 ipl_devno;
                                 IPL_PARMBLOCK_ORIGIN)
  #define IPL_PARMBLOCK_SIZE    (IPL_PARMBLOCK_START->hdr.length)
  
-+#endif /* __KERNEL__ */
-+
- #else 
+-#else 
++#else /* __ASSEMBLY__ */
  
  #ifndef __s390x__
+ #define IPL_DEVICE        0x10404
+@@ -127,6 +129,6 @@ extern u16 ipl_devno;
+ #endif /* __s390x__ */
+ #define COMMAND_LINE      0x10480
+ 
+-#endif
+-
+-#endif
++#endif /* __ASSEMBLY__ */
++#endif /* __KERNEL__ */
++#endif /* _ASM_S390_SETUP_H */