diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2017-03-22 20:54:52 +0300 |
|---|---|---|
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2017-03-22 20:54:52 +0300 |
| commit | 7c2b3e0ddc063f61a201ccb70a121fecc8373a49 (patch) | |
| tree | 6dfb348a27459cb2058124c1d8417680c194ed54 /include/uapi/linux | |
| parent | 947b897204c417d22ad90e5f354858d78de15a07 (diff) | |
| parent | 916cda1aa1b412d7cf2991c3af7479544942d121 (diff) | |
| download | linux-7c2b3e0ddc063f61a201ccb70a121fecc8373a49.tar.xz | |
Merge remote-tracking branch 's390/guarded-storage' into kvms390/next
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/elf.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/packet_diag.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h index b59ee077a596..8c6d3bdb9a00 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -409,6 +409,7 @@ typedef struct elf64_shdr { #define NT_S390_TDB 0x308 /* s390 transaction diagnostic block */ #define NT_S390_VXRS_LOW 0x309 /* s390 vector registers 0-15 upper half */ #define NT_S390_VXRS_HIGH 0x30a /* s390 vector registers 16-31 */ +#define NT_S390_GS_CB 0x30b /* s390 guarded storage registers */ #define NT_ARM_VFP 0x400 /* ARM VFP/NEON registers */ #define NT_ARM_TLS 0x401 /* ARM TLS register */ #define NT_ARM_HW_BREAK 0x402 /* ARM hardware breakpoint registers */ diff --git a/include/uapi/linux/packet_diag.h b/include/uapi/linux/packet_diag.h index d08c63f3dd6f..0c5d5dd61b6a 100644 --- a/include/uapi/linux/packet_diag.h +++ b/include/uapi/linux/packet_diag.h @@ -64,7 +64,7 @@ struct packet_diag_mclist { __u32 pdmc_count; __u16 pdmc_type; __u16 pdmc_alen; - __u8 pdmc_addr[MAX_ADDR_LEN]; + __u8 pdmc_addr[32]; /* MAX_ADDR_LEN */ }; struct packet_diag_ring { |