hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Heiko Carstens 2006-02-11 17:56:03 -08:00 committed by Linus Torvalds
parent e7684277f6
commit 0defa3c19e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/asm-s390/setup.h
View File

@ -8,6 +8,8 @@
#ifndef _ASM_S390_SETUP_H #ifndef _ASM_S390_SETUP_H
#define _ASM_S390_SETUP_H #define _ASM_S390_SETUP_H
#ifdef __KERNEL__
#include <asm/types.h> #include <asm/types.h>
#define PARMAREA 0x10400 #define PARMAREA 0x10400
@ -114,7 +116,7 @@ extern u16 ipl_devno;
IPL_PARMBLOCK_ORIGIN) IPL_PARMBLOCK_ORIGIN)
#define IPL_PARMBLOCK_SIZE (IPL_PARMBLOCK_START->hdr.length) #define IPL_PARMBLOCK_SIZE (IPL_PARMBLOCK_START->hdr.length)
#else #else /* __ASSEMBLY__ */
#ifndef __s390x__ #ifndef __s390x__
#define IPL_DEVICE 0x10404 #define IPL_DEVICE 0x10404
@ -127,6 +129,6 @@ extern u16 ipl_devno;
#endif /* __s390x__ */ #endif /* __s390x__ */
#define COMMAND_LINE 0x10480 #define COMMAND_LINE 0x10480
#endif #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif #endif /* _ASM_S390_SETUP_H */