Skip to content

Commit

Permalink
[PATCH] s390: add #ifdef __KERNEL__ to asm-s390/setup.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
heicarst authored and Linus Torvalds committed Feb 12, 2006
1 parent e768427 commit 0defa3c
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions include/asm-s390/setup.h
Expand Up @@ -8,6 +8,8 @@
#ifndef _ASM_S390_SETUP_H
#define _ASM_S390_SETUP_H

#ifdef __KERNEL__

#include <asm/types.h>

#define PARMAREA 0x10400
Expand Down Expand Up @@ -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
Expand All @@ -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 */

0 comments on commit 0defa3c

Please sign in to comment.