projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'for-4.4/upstream-fixes', 'for-4.5/async-suspend', 'for-4.5/container...
[cascardo/linux.git]
/
arch
/
s390
/
include
/
asm
/
ipl.h
diff --git
a/arch/s390/include/asm/ipl.h
b/arch/s390/include/asm/ipl.h
index
39ae6a3
..
86634e7
100644
(file)
--- a/
arch/s390/include/asm/ipl.h
+++ b/
arch/s390/include/asm/ipl.h
@@
-64,7
+64,8
@@
struct ipl_block_fcp {
struct ipl_block_ccw {
u8 reserved1[84];
- u8 reserved2[2];
+ u16 reserved2 : 13;
+ u8 ssid : 3;
u16 devno;
u8 vm_flags;
u8 reserved3[3];