hello greg,
On Thu, 09 Feb 2006, Greg KH wrote:
> On Wed, Feb 01, 2006 at 11:41:10AM +0100, maximilian attems wrote:
> > klibc doesn't currently build on s390 since
> > commit 1e8e338325fa0f2bd5c1c800086e900cf188d2cd
> >
> > belows patch adds some kernel ifdef for the newly added section.
>
> queued to -stable, thanks.
>
> greg k-h
the s390 gys massaged the patch, please take belows.
akpm already merged this one.
thanks for your work!!!
--
maks
From: Heiko Carstens <[EMAIL PROTECTED]>
Based on a patch from Maximilian Attems <[EMAIL PROTECTED]> .
Nothing in asm-s390/setup.h is of interest for user space.
Signed-off-by: Heiko Carstens <[EMAIL PROTECTED]>
---
diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h
index 348a881..da3fd4a 100644
--- a/include/asm-s390/setup.h
+++ b/include/asm-s390/setup.h
@@ -8,6 +8,8 @@
#ifndef _ASM_S390_SETUP_H
#define _ASM_S390_SETUP_H
+#ifdef __KERNEL__
+
#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)
-#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 */
----------------------------------------------------------------------
For LINUX-390 subscribe / signoff / archive access instructions,
send email to [EMAIL PROTECTED] with the message: INFO LINUX-390 or visit
http://www.marist.edu/htbin/wlvindex?LINUX-390
