* [patch 09/10] s390: add #ifdef __KERNEL__ to asm-s390/setup.h
@ 2006-02-08 12:41 Heiko Carstens
0 siblings, 0 replies; only message in thread
From: Heiko Carstens @ 2006-02-08 12:41 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, Maximilian Attems
From: Heiko Carstens <heiko.carstens@de.ibm.com>
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: Heiko Carstens <heiko.carstens@de.ibm.com>
---
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 */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-02-08 12:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-02-08 12:41 [patch 09/10] s390: add #ifdef __KERNEL__ to asm-s390/setup.h Heiko Carstens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®