diff --git a/[refs] b/[refs] index 8e1891e2b0a6..2758449219fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61fd330dee1606a6bdb741f9c156bca386a4e438 +refs/heads/master: 73bfa5f2f71efcdcaad8d18cbed96b9d7ed86948 diff --git a/trunk/include/linux/elf.h b/trunk/include/linux/elf.h index 0cc4d55151b7..39ad4b230a4a 100644 --- a/trunk/include/linux/elf.h +++ b/trunk/include/linux/elf.h @@ -362,6 +362,11 @@ typedef struct elf64_shdr { #define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */ #define NT_386_IOPERM 0x201 /* x86 io permission bitmap (1=deny) */ #define NT_S390_HIGH_GPRS 0x300 /* s390 upper register halves */ +#define NT_S390_TIMER 0x301 /* s390 timer register */ +#define NT_S390_TODCMP 0x302 /* s390 TOD clock comparator register */ +#define NT_S390_TODPREG 0x303 /* s390 TOD programmable register */ +#define NT_S390_CTRS 0x304 /* s390 control registers */ +#define NT_S390_PREFIX 0x305 /* s390 prefix register */ /* Note header in a PT_NOTE section */