[S390] add hardware capability support (ELF_HWCAP).

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

2 files changed, 11 insertions, 6 deletions

diff --git a/include/asm-s390/elf.h b/include/asm-s390/elf.h
index c0d629d61d3e..91d06325cc79 100644
--- a/include/asm-s390/elf.h
+++ b/include/asm-s390/elf.h
@@ -188,7 +188,8 @@ static inline int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpregs)
 /* This yields a mask that user programs can use to figure out what
    instruction set this CPU supports. */
 
-#define ELF_HWCAP (0)
+extern unsigned long elf_hwcap;
+#define ELF_HWCAP (elf_hwcap)
 
 /* This yields a string that ld.so will use to load implementation
    specific libraries for optimization.  This is more specific in
@@ -197,7 +198,9 @@ static inline int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpregs)
    For the moment, we have only optimizations for the Intel generations,
    but that could change... */
 
-#define ELF_PLATFORM (NULL)
+#define ELF_PLATFORM_SIZE 8
+extern char elf_platform[];
+#define ELF_PLATFORM (elf_platform)
 
 #ifndef __s390x__
 #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
diff --git a/include/asm-s390/lowcore.h b/include/asm-s390/lowcore.h
index ffc9788a21a7..801a6fd35b5b 100644
--- a/include/asm-s390/lowcore.h
+++ b/include/asm-s390/lowcore.h
@@ -229,17 +229,19 @@ struct _lowcore
         __u16        subchannel_nr;            /* 0x0ba */
         __u32        io_int_parm;              /* 0x0bc */
         __u32        io_int_word;              /* 0x0c0 */
-        __u8         pad3[0xD4-0xC4];          /* 0x0c4 */
+        __u8         pad3[0xc8-0xc4];          /* 0x0c4 */
+        __u32        stfl_fac_list;            /* 0x0c8 */
+        __u8         pad4[0xd4-0xcc];          /* 0x0cc */
         __u32        extended_save_area_addr;  /* 0x0d4 */
         __u32        cpu_timer_save_area[2];   /* 0x0d8 */
         __u32        clock_comp_save_area[2];  /* 0x0e0 */
         __u32        mcck_interruption_code[2]; /* 0x0e8 */
-        __u8         pad4[0xf4-0xf0];          /* 0x0f0 */
+        __u8         pad5[0xf4-0xf0];          /* 0x0f0 */
         __u32        external_damage_code;     /* 0x0f4 */
         __u32        failing_storage_address;  /* 0x0f8 */
-        __u8         pad5[0x100-0xfc];         /* 0x0fc */
+        __u8         pad6[0x100-0xfc];         /* 0x0fc */
         __u32        st_status_fixed_logout[4];/* 0x100 */
-        __u8         pad6[0x120-0x110];        /* 0x110 */
+        __u8         pad7[0x120-0x110];        /* 0x110 */
         __u32        access_regs_save_area[16];/* 0x120 */
         __u32        floating_pt_save_area[8]; /* 0x160 */
         __u32        gpregs_save_area[16];     /* 0x180 */