Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[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>
authored by Heiko Carstens and committed by Linus Torvalds 0defa3c1 e7684277
+6
-4
include/asm-s390/setup.h
+6
-4
include/asm-s390/setup.h
···
8
8
#ifndef _ASM_S390_SETUP_H
9
9
#define _ASM_S390_SETUP_H
10
10
11
+
#ifdef __KERNEL__
12
+
11
13
#include <asm/types.h>
12
14
13
15
#define PARMAREA 0x10400
···
116
114
IPL_PARMBLOCK_ORIGIN)
117
115
#define IPL_PARMBLOCK_SIZE (IPL_PARMBLOCK_START->hdr.length)
118
116
119
-
#else
117
+
#else /* __ASSEMBLY__ */
120
118
121
119
#ifndef __s390x__
122
120
#define IPL_DEVICE 0x10404
···
129
127
#endif /* __s390x__ */
130
128
#define COMMAND_LINE 0x10480
131
129
132
-
#endif
133
-
134
-
#endif
130
+
#endif /* __ASSEMBLY__ */
131
+
#endif /* __KERNEL__ */
132
+
#endif /* _ASM_S390_SETUP_H */