diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2006-02-11 20:56:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-12 00:41:13 -0500 |
commit | 0defa3c19e7792001df09d6fa5ab461d3599ff6d (patch) | |
tree | 343a78463c4c0a354192c2ceca11e80ee6153aab /include/asm-s390 | |
parent | e7684277f6882a23cfb734cb7450c3a469e6e8b1 (diff) |
[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>
Diffstat (limited to 'include/asm-s390')
-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 348a8813744..da3fd4a7bb3 100644 --- a/include/asm-s390/setup.h +++ b/include/asm-s390/setup.h | |||
@@ -8,6 +8,8 @@ | |||
8 | #ifndef _ASM_S390_SETUP_H | 8 | #ifndef _ASM_S390_SETUP_H |
9 | #define _ASM_S390_SETUP_H | 9 | #define _ASM_S390_SETUP_H |
10 | 10 | ||
11 | #ifdef __KERNEL__ | ||
12 | |||
11 | #include <asm/types.h> | 13 | #include <asm/types.h> |
12 | 14 | ||
13 | #define PARMAREA 0x10400 | 15 | #define PARMAREA 0x10400 |
@@ -114,7 +116,7 @@ extern u16 ipl_devno; | |||
114 | IPL_PARMBLOCK_ORIGIN) | 116 | IPL_PARMBLOCK_ORIGIN) |
115 | #define IPL_PARMBLOCK_SIZE (IPL_PARMBLOCK_START->hdr.length) | 117 | #define IPL_PARMBLOCK_SIZE (IPL_PARMBLOCK_START->hdr.length) |
116 | 118 | ||
117 | #else | 119 | #else /* __ASSEMBLY__ */ |
118 | 120 | ||
119 | #ifndef __s390x__ | 121 | #ifndef __s390x__ |
120 | #define IPL_DEVICE 0x10404 | 122 | #define IPL_DEVICE 0x10404 |
@@ -127,6 +129,6 @@ extern u16 ipl_devno; | |||
127 | #endif /* __s390x__ */ | 129 | #endif /* __s390x__ */ |
128 | #define COMMAND_LINE 0x10480 | 130 | #define COMMAND_LINE 0x10480 |
129 | 131 | ||
130 | #endif | 132 | #endif /* __ASSEMBLY__ */ |
131 | 133 | #endif /* __KERNEL__ */ | |
132 | #endif | 134 | #endif /* _ASM_S390_SETUP_H */ |