diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2006-02-11 17:56:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-11 21:41:13 -0800 |
| commit | 0defa3c19e7792001df09d6fa5ab461d3599ff6d (patch) | |
| tree | 343a78463c4c0a354192c2ceca11e80ee6153aab | |
| parent | e7684277f6882a23cfb734cb7450c3a469e6e8b1 (diff) | |
| download | lwn-0defa3c19e7792001df09d6fa5ab461d3599ff6d.tar.gz lwn-0defa3c19e7792001df09d6fa5ab461d3599ff6d.zip | |
[PATCH] s390: add #ifdef __KERNEL__ to asm-s390/setup.h
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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | include/asm-s390/setup.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h index 348a88137445..da3fd4a7bb32 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 */ |