1 files changed, 16 insertions, 22 deletions

diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c
index fface87056e..2b45591e158 100644
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@ -8,8 +8,8 @@
 
 #include <linux/kbuild.h>
 #include <linux/sched.h>
-#include <asm/cputime.h>
 #include <asm/vdso.h>
+#include <asm/sigp.h>
 #include <asm/pgtable.h>
 
 /*
@@ -45,8 +45,8 @@ int main(void)
         DEFINE(__PT_PSW, offsetof(struct pt_regs, psw));
         DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs));
         DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2));
-        DEFINE(__PT_INT_CODE, offsetof(struct pt_regs, int_code));
-        DEFINE(__PT_INT_PARM_LONG, offsetof(struct pt_regs, int_parm_long));
+        DEFINE(__PT_ILC, offsetof(struct pt_regs, ilc));
+        DEFINE(__PT_SVCNR, offsetof(struct pt_regs, svcnr));
         DEFINE(__PT_SIZE, sizeof(struct pt_regs));
         BLANK();
         DEFINE(__SF_BACKCHAIN, offsetof(struct stack_frame, back_chain));
@@ -70,14 +70,15 @@ int main(void)
         DEFINE(__CLOCK_MONOTONIC, CLOCK_MONOTONIC);
         DEFINE(__CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC);
         BLANK();
-        /* idle data offsets */
-        DEFINE(__CLOCK_IDLE_ENTER, offsetof(struct s390_idle_data, clock_idle_enter));
-        DEFINE(__CLOCK_IDLE_EXIT, offsetof(struct s390_idle_data, clock_idle_exit));
-        DEFINE(__TIMER_IDLE_ENTER, offsetof(struct s390_idle_data, timer_idle_enter));
-        DEFINE(__TIMER_IDLE_EXIT, offsetof(struct s390_idle_data, timer_idle_exit));
+        /* constants for SIGP */
+        DEFINE(__SIGP_STOP, sigp_stop);
+        DEFINE(__SIGP_RESTART, sigp_restart);
+        DEFINE(__SIGP_SENSE, sigp_sense);
+        DEFINE(__SIGP_INITIAL_CPU_RESET, sigp_initial_cpu_reset);
+        BLANK();
         /* lowcore offsets */
         DEFINE(__LC_EXT_PARAMS, offsetof(struct _lowcore, ext_params));
-        DEFINE(__LC_EXT_CPU_ADDR, offsetof(struct _lowcore, ext_cpu_addr));
+        DEFINE(__LC_CPU_ADDRESS, offsetof(struct _lowcore, cpu_addr));
         DEFINE(__LC_EXT_INT_CODE, offsetof(struct _lowcore, ext_int_code));
         DEFINE(__LC_SVC_ILC, offsetof(struct _lowcore, svc_ilc));
         DEFINE(__LC_SVC_INT_CODE, offsetof(struct _lowcore, svc_code));
@@ -94,22 +95,21 @@ int main(void)
         DEFINE(__LC_IO_INT_WORD, offsetof(struct _lowcore, io_int_word));
         DEFINE(__LC_STFL_FAC_LIST, offsetof(struct _lowcore, stfl_fac_list));
         DEFINE(__LC_MCCK_CODE, offsetof(struct _lowcore, mcck_interruption_code));
+        DEFINE(__LC_DUMP_REIPL, offsetof(struct _lowcore, ipib));
+        BLANK();
+        DEFINE(__LC_RST_NEW_PSW, offsetof(struct _lowcore, restart_psw));
         DEFINE(__LC_RST_OLD_PSW, offsetof(struct _lowcore, restart_old_psw));
         DEFINE(__LC_EXT_OLD_PSW, offsetof(struct _lowcore, external_old_psw));
         DEFINE(__LC_SVC_OLD_PSW, offsetof(struct _lowcore, svc_old_psw));
         DEFINE(__LC_PGM_OLD_PSW, offsetof(struct _lowcore, program_old_psw));
         DEFINE(__LC_MCK_OLD_PSW, offsetof(struct _lowcore, mcck_old_psw));
         DEFINE(__LC_IO_OLD_PSW, offsetof(struct _lowcore, io_old_psw));
-        DEFINE(__LC_RST_NEW_PSW, offsetof(struct _lowcore, restart_psw));
         DEFINE(__LC_EXT_NEW_PSW, offsetof(struct _lowcore, external_new_psw));
         DEFINE(__LC_SVC_NEW_PSW, offsetof(struct _lowcore, svc_new_psw));
         DEFINE(__LC_PGM_NEW_PSW, offsetof(struct _lowcore, program_new_psw));
         DEFINE(__LC_MCK_NEW_PSW, offsetof(struct _lowcore, mcck_new_psw));
         DEFINE(__LC_IO_NEW_PSW, offsetof(struct _lowcore, io_new_psw));
-        BLANK();
-        DEFINE(__LC_SAVE_AREA_SYNC, offsetof(struct _lowcore, save_area_sync));
-        DEFINE(__LC_SAVE_AREA_ASYNC, offsetof(struct _lowcore, save_area_async));
-        DEFINE(__LC_SAVE_AREA_RESTART, offsetof(struct _lowcore, save_area_restart));
+        DEFINE(__LC_SAVE_AREA, offsetof(struct _lowcore, save_area));
         DEFINE(__LC_RETURN_PSW, offsetof(struct _lowcore, return_psw));
         DEFINE(__LC_RETURN_MCCK_PSW, offsetof(struct _lowcore, return_mcck_psw));
         DEFINE(__LC_SYNC_ENTER_TIMER, offsetof(struct _lowcore, sync_enter_timer));
@@ -127,18 +127,12 @@ int main(void)
         DEFINE(__LC_KERNEL_STACK, offsetof(struct _lowcore, kernel_stack));
         DEFINE(__LC_ASYNC_STACK, offsetof(struct _lowcore, async_stack));
         DEFINE(__LC_PANIC_STACK, offsetof(struct _lowcore, panic_stack));
-        DEFINE(__LC_RESTART_STACK, offsetof(struct _lowcore, restart_stack));
-        DEFINE(__LC_RESTART_FN, offsetof(struct _lowcore, restart_fn));
-        DEFINE(__LC_RESTART_DATA, offsetof(struct _lowcore, restart_data));
-        DEFINE(__LC_RESTART_SOURCE, offsetof(struct _lowcore, restart_source));
         DEFINE(__LC_USER_ASCE, offsetof(struct _lowcore, user_asce));
         DEFINE(__LC_INT_CLOCK, offsetof(struct _lowcore, int_clock));
         DEFINE(__LC_MCCK_CLOCK, offsetof(struct _lowcore, mcck_clock));
         DEFINE(__LC_MACHINE_FLAGS, offsetof(struct _lowcore, machine_flags));
         DEFINE(__LC_FTRACE_FUNC, offsetof(struct _lowcore, ftrace_func));
         DEFINE(__LC_IRB, offsetof(struct _lowcore, irb));
-        DEFINE(__LC_DUMP_REIPL, offsetof(struct _lowcore, ipib));
-        BLANK();
         DEFINE(__LC_CPU_TIMER_SAVE_AREA, offsetof(struct _lowcore, cpu_timer_save_area));
         DEFINE(__LC_CLOCK_COMP_SAVE_AREA, offsetof(struct _lowcore, clock_comp_save_area));
         DEFINE(__LC_PSW_SAVE_AREA, offsetof(struct _lowcore, psw_save_area));
@@ -147,6 +141,7 @@ int main(void)
         DEFINE(__LC_FPREGS_SAVE_AREA, offsetof(struct _lowcore, floating_pt_save_area));
         DEFINE(__LC_GPREGS_SAVE_AREA, offsetof(struct _lowcore, gpregs_save_area));
         DEFINE(__LC_CREGS_SAVE_AREA, offsetof(struct _lowcore, cregs_save_area));
+        DEFINE(__LC_SAVE_AREA_64, offsetof(struct _lowcore, save_area_64));
 #ifdef CONFIG_32BIT
         DEFINE(SAVE_AREA_BASE, offsetof(struct _lowcore, extended_save_area_addr));
 #else /* CONFIG_32BIT */
@@ -157,8 +152,7 @@ int main(void)
         DEFINE(__LC_LAST_BREAK, offsetof(struct _lowcore, breaking_event_addr));
         DEFINE(__LC_VDSO_PER_CPU, offsetof(struct _lowcore, vdso_per_cpu_data));
         DEFINE(__LC_GMAP, offsetof(struct _lowcore, gmap));
-        DEFINE(__LC_PGM_TDB, offsetof(struct _lowcore, pgm_tdb));
-        DEFINE(__THREAD_trap_tdb, offsetof(struct task_struct, thread.trap_tdb));
+        DEFINE(__LC_CMF_HPP, offsetof(struct _lowcore, cmf_hpp));
         DEFINE(__GMAP_ASCE, offsetof(struct gmap, asce));
 #endif /* CONFIG_32BIT */
         return 0;