diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2006-09-20 15:59:15 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-09-20 15:59:15 +0200 |
| commit | e87bfe51b5ca2db99dd680bbb1e8fe3c94b607df (patch) | |
| tree | abbffd8e3ca0edcbe5a0e36e1e94deb9a3b10adc /include/asm-s390 | |
| parent | 1375fc1fb0434a26f93c59b1b9f3fdb8bf90bba5 (diff) | |
| download | blackbird-op-linux-e87bfe51b5ca2db99dd680bbb1e8fe3c94b607df.tar.gz blackbird-op-linux-e87bfe51b5ca2db99dd680bbb1e8fe3c94b607df.zip | |
[S390] convert some assembler to C.
Convert GET_IPL_DEVICE assembler macro to C function.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'include/asm-s390')
| -rw-r--r-- | include/asm-s390/lowcore.h | 1 | ||||
| -rw-r--r-- | include/asm-s390/setup.h | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/asm-s390/lowcore.h b/include/asm-s390/lowcore.h index 2e3d4cca5e21..18695d10dedf 100644 --- a/include/asm-s390/lowcore.h +++ b/include/asm-s390/lowcore.h @@ -35,6 +35,7 @@ #define __LC_IO_NEW_PSW 0x01f0 #endif /* !__s390x__ */ +#define __LC_IPL_PARMBLOCK_PTR 0x014 #define __LC_EXT_PARAMS 0x080 #define __LC_CPU_ADDRESS 0x084 #define __LC_EXT_INT_CODE 0x086 diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h index 4a1126d8439a..00c03e46689b 100644 --- a/include/asm-s390/setup.h +++ b/include/asm-s390/setup.h @@ -125,13 +125,15 @@ struct ipl_parameter_block { /* * IPL validity flags and parameters as detected in head.S */ -extern u32 ipl_parameter_flags; +extern u32 ipl_flags; extern u16 ipl_devno; void do_reipl(void); -#define IPL_DEVNO_VALID (ipl_parameter_flags & 1) -#define IPL_PARMBLOCK_VALID (ipl_parameter_flags & 2) +enum { + IPL_DEVNO_VALID = 1, + IPL_PARMBLOCK_VALID = 2, +}; #define IPL_PARMBLOCK_START ((struct ipl_parameter_block *) \ IPL_PARMBLOCK_ORIGIN) |
