diff options
| author | Vasily Gorbik <gor@linux.ibm.com> | 2018-04-03 16:02:40 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-04-10 07:38:58 +0200 |
| commit | bdbfe18595ceabd2b6b4e3abae9c3911802e3cb1 (patch) | |
| tree | 06378b5e9a7e6eb2451600158f9ed86ddad0e613 /arch/s390/include | |
| parent | s390/ipl: ensure loadparm valid flag is set (diff) | |
| download | linux-bdbfe18595ceabd2b6b4e3abae9c3911802e3cb1.tar.xz linux-bdbfe18595ceabd2b6b4e3abae9c3911802e3cb1.zip | |
s390/ipl: unite diag308 and scsi boot ipl blocks
Ipl parm blocks received via "diag308 store" and during scsi boot at
IPL_PARMBLOCK_ORIGIN are merged into the "ipl_block".
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/ipl.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h index 186c7b5f5511..3a745343fe4e 100644 --- a/arch/s390/include/asm/ipl.h +++ b/arch/s390/include/asm/ipl.h @@ -29,10 +29,6 @@ #define IPL_MAX_SUPPORTED_VERSION (0) -#define IPL_PARMBLOCK_START ((struct ipl_parameter_block *) \ - IPL_PARMBLOCK_ORIGIN) -#define IPL_PARMBLOCK_SIZE (IPL_PARMBLOCK_START->hdr.len) - struct ipl_list_hdr { u32 len; u8 reserved1[3]; @@ -83,6 +79,7 @@ struct ipl_parameter_block { union { struct ipl_block_fcp fcp; struct ipl_block_ccw ccw; + char raw[PAGE_SIZE - sizeof(struct ipl_list_hdr)]; } ipl_info; } __packed __aligned(PAGE_SIZE); |