s390/asm: make use of the OFFSET macro to define assember constants

The use of OFFSET instead of DEFINE makes the definitions in asm-offsets.c
more readable. While we are at it sort the defines for struct _lowcore
according to the field order and remove some unneeded defines.

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

diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c
index f77834a498a9dcdbef8ad26b8ea41acd76fa3eca..ac857c452be2c0195c94e26350f8def4b03eb751 100644 (file)
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@ -23,58 +23,64 @@
 
 int main(void)
 {
-       DEFINE(__TASK_thread_info, offsetof(struct task_struct, stack));
-       DEFINE(__TASK_thread, offsetof(struct task_struct, thread));
-       DEFINE(__TASK_pid, offsetof(struct task_struct, pid));
+       /* task struct offsets */
+       OFFSET(__TASK_thread_info, task_struct, stack);
+       OFFSET(__TASK_thread, task_struct, thread);
+       OFFSET(__TASK_pid, task_struct, pid);
        BLANK();
-       DEFINE(__THREAD_ksp, offsetof(struct thread_struct, ksp));
-       DEFINE(__THREAD_FPU_fpc, offsetof(struct thread_struct, fpu.fpc));
-       DEFINE(__THREAD_FPU_regs, offsetof(struct thread_struct, fpu.regs));
-       DEFINE(__THREAD_per_cause, offsetof(struct thread_struct, per_event.cause));
-       DEFINE(__THREAD_per_address, offsetof(struct thread_struct, per_event.address));
-       DEFINE(__THREAD_per_paid, offsetof(struct thread_struct, per_event.paid));
-       DEFINE(__THREAD_trap_tdb, offsetof(struct thread_struct, trap_tdb));
+       /* thread struct offsets */
+       OFFSET(__THREAD_ksp, thread_struct, ksp);
+       OFFSET(__THREAD_FPU_fpc, thread_struct, fpu.fpc);
+       OFFSET(__THREAD_FPU_regs, thread_struct, fpu.regs);
+       OFFSET(__THREAD_per_cause, thread_struct, per_event.cause);
+       OFFSET(__THREAD_per_address, thread_struct, per_event.address);
+       OFFSET(__THREAD_per_paid, thread_struct, per_event.paid);
+       OFFSET(__THREAD_trap_tdb, thread_struct, trap_tdb);
        BLANK();
-       DEFINE(__TI_task, offsetof(struct thread_info, task));
-       DEFINE(__TI_flags, offsetof(struct thread_info, flags));
-       DEFINE(__TI_sysc_table, offsetof(struct thread_info, sys_call_table));
-       DEFINE(__TI_cpu, offsetof(struct thread_info, cpu));
-       DEFINE(__TI_precount, offsetof(struct thread_info, preempt_count));
-       DEFINE(__TI_user_timer, offsetof(struct thread_info, user_timer));
-       DEFINE(__TI_system_timer, offsetof(struct thread_info, system_timer));
-       DEFINE(__TI_last_break, offsetof(struct thread_info, last_break));
+       /* thread info offsets */
+       OFFSET(__TI_task, thread_info, task);
+       OFFSET(__TI_flags, thread_info, flags);
+       OFFSET(__TI_sysc_table, thread_info, sys_call_table);
+       OFFSET(__TI_cpu, thread_info, cpu);
+       OFFSET(__TI_precount, thread_info, preempt_count);
+       OFFSET(__TI_user_timer, thread_info, user_timer);
+       OFFSET(__TI_system_timer, thread_info, system_timer);
+       OFFSET(__TI_last_break, thread_info, last_break);
        BLANK();
-       DEFINE(__PT_ARGS, offsetof(struct pt_regs, args));
-       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, offsetof(struct pt_regs, int_parm));
-       DEFINE(__PT_INT_PARM_LONG, offsetof(struct pt_regs, int_parm_long));
-       DEFINE(__PT_FLAGS, offsetof(struct pt_regs, flags));
+       /* pt_regs offsets */
+       OFFSET(__PT_ARGS, pt_regs, args);
+       OFFSET(__PT_PSW, pt_regs, psw);
+       OFFSET(__PT_GPRS, pt_regs, gprs);
+       OFFSET(__PT_ORIG_GPR2, pt_regs, orig_gpr2);
+       OFFSET(__PT_INT_CODE, pt_regs, int_code);
+       OFFSET(__PT_INT_PARM, pt_regs, int_parm);
+       OFFSET(__PT_INT_PARM_LONG, pt_regs, int_parm_long);
+       OFFSET(__PT_FLAGS, pt_regs, flags);
        DEFINE(__PT_SIZE, sizeof(struct pt_regs));
        BLANK();
-       DEFINE(__SF_BACKCHAIN, offsetof(struct stack_frame, back_chain));
-       DEFINE(__SF_GPRS, offsetof(struct stack_frame, gprs));
-       DEFINE(__SF_EMPTY, offsetof(struct stack_frame, empty1));
+       /* stack_frame offsets */
+       OFFSET(__SF_BACKCHAIN, stack_frame, back_chain);
+       OFFSET(__SF_GPRS, stack_frame, gprs);
+       OFFSET(__SF_EMPTY, stack_frame, empty1);
        BLANK();
        /* timeval/timezone offsets for use by vdso */
-       DEFINE(__VDSO_UPD_COUNT, offsetof(struct vdso_data, tb_update_count));
-       DEFINE(__VDSO_XTIME_STAMP, offsetof(struct vdso_data, xtime_tod_stamp));
-       DEFINE(__VDSO_XTIME_SEC, offsetof(struct vdso_data, xtime_clock_sec));
-       DEFINE(__VDSO_XTIME_NSEC, offsetof(struct vdso_data, xtime_clock_nsec));
-       DEFINE(__VDSO_XTIME_CRS_SEC, offsetof(struct vdso_data, xtime_coarse_sec));
-       DEFINE(__VDSO_XTIME_CRS_NSEC, offsetof(struct vdso_data, xtime_coarse_nsec));
-       DEFINE(__VDSO_WTOM_SEC, offsetof(struct vdso_data, wtom_clock_sec));
-       DEFINE(__VDSO_WTOM_NSEC, offsetof(struct vdso_data, wtom_clock_nsec));
-       DEFINE(__VDSO_WTOM_CRS_SEC, offsetof(struct vdso_data, wtom_coarse_sec));
-       DEFINE(__VDSO_WTOM_CRS_NSEC, offsetof(struct vdso_data, wtom_coarse_nsec));
-       DEFINE(__VDSO_TIMEZONE, offsetof(struct vdso_data, tz_minuteswest));
-       DEFINE(__VDSO_ECTG_OK, offsetof(struct vdso_data, ectg_available));
-       DEFINE(__VDSO_TK_MULT, offsetof(struct vdso_data, tk_mult));
-       DEFINE(__VDSO_TK_SHIFT, offsetof(struct vdso_data, tk_shift));
-       DEFINE(__VDSO_ECTG_BASE, offsetof(struct vdso_per_cpu_data, ectg_timer_base));
-       DEFINE(__VDSO_ECTG_USER, offsetof(struct vdso_per_cpu_data, ectg_user_time));
+       OFFSET(__VDSO_UPD_COUNT, vdso_data, tb_update_count);
+       OFFSET(__VDSO_XTIME_STAMP, vdso_data, xtime_tod_stamp);
+       OFFSET(__VDSO_XTIME_SEC, vdso_data, xtime_clock_sec);
+       OFFSET(__VDSO_XTIME_NSEC, vdso_data, xtime_clock_nsec);
+       OFFSET(__VDSO_XTIME_CRS_SEC, vdso_data, xtime_coarse_sec);
+       OFFSET(__VDSO_XTIME_CRS_NSEC, vdso_data, xtime_coarse_nsec);
+       OFFSET(__VDSO_WTOM_SEC, vdso_data, wtom_clock_sec);
+       OFFSET(__VDSO_WTOM_NSEC, vdso_data, wtom_clock_nsec);
+       OFFSET(__VDSO_WTOM_CRS_SEC, vdso_data, wtom_coarse_sec);
+       OFFSET(__VDSO_WTOM_CRS_NSEC, vdso_data, wtom_coarse_nsec);
+       OFFSET(__VDSO_TIMEZONE, vdso_data, tz_minuteswest);
+       OFFSET(__VDSO_ECTG_OK, vdso_data, ectg_available);
+       OFFSET(__VDSO_TK_MULT, vdso_data, tk_mult);
+       OFFSET(__VDSO_TK_SHIFT, vdso_data, tk_shift);
+       OFFSET(__VDSO_ECTG_BASE, vdso_per_cpu_data, ectg_timer_base);
+       OFFSET(__VDSO_ECTG_USER, vdso_per_cpu_data, ectg_user_time);
+       BLANK();
        /* constants used by the vdso */
        DEFINE(__CLOCK_REALTIME, CLOCK_REALTIME);
        DEFINE(__CLOCK_MONOTONIC, CLOCK_MONOTONIC);
@@ -85,102 +91,104 @@ int main(void)
        DEFINE(__CLOCK_COARSE_RES, LOW_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));
-       /* lowcore offsets */
-       DEFINE(__LC_EXT_PARAMS, offsetof(struct _lowcore, ext_params));
-       DEFINE(__LC_EXT_CPU_ADDR, offsetof(struct _lowcore, ext_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));
-       DEFINE(__LC_PGM_ILC, offsetof(struct _lowcore, pgm_ilc));
-       DEFINE(__LC_PGM_INT_CODE, offsetof(struct _lowcore, pgm_code));
-       DEFINE(__LC_TRANS_EXC_CODE, offsetof(struct _lowcore, trans_exc_code));
-       DEFINE(__LC_MON_CLASS_NR, offsetof(struct _lowcore, mon_class_num));
-       DEFINE(__LC_PER_CODE, offsetof(struct _lowcore, per_code));
-       DEFINE(__LC_PER_ATMID, offsetof(struct _lowcore, per_atmid));
-       DEFINE(__LC_PER_ADDRESS, offsetof(struct _lowcore, per_address));
-       DEFINE(__LC_EXC_ACCESS_ID, offsetof(struct _lowcore, exc_access_id));
-       DEFINE(__LC_PER_ACCESS_ID, offsetof(struct _lowcore, per_access_id));
-       DEFINE(__LC_OP_ACCESS_ID, offsetof(struct _lowcore, op_access_id));
-       DEFINE(__LC_AR_MODE_ID, offsetof(struct _lowcore, ar_mode_id));
-       DEFINE(__LC_MON_CODE, offsetof(struct _lowcore, monitor_code));
-       DEFINE(__LC_SUBCHANNEL_ID, offsetof(struct _lowcore, subchannel_id));
-       DEFINE(__LC_SUBCHANNEL_NR, offsetof(struct _lowcore, subchannel_nr));
-       DEFINE(__LC_IO_INT_PARM, offsetof(struct _lowcore, io_int_parm));
-       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_MCCK_EXT_DAM_CODE, offsetof(struct _lowcore, external_damage_code));
-       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));
+       OFFSET(__CLOCK_IDLE_ENTER, s390_idle_data, clock_idle_enter);
+       OFFSET(__CLOCK_IDLE_EXIT, s390_idle_data, clock_idle_exit);
+       OFFSET(__TIMER_IDLE_ENTER, s390_idle_data, timer_idle_enter);
+       OFFSET(__TIMER_IDLE_EXIT, s390_idle_data, timer_idle_exit);
        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_CPU_FLAGS, offsetof(struct _lowcore, cpu_flags));
-       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));
-       DEFINE(__LC_ASYNC_ENTER_TIMER, offsetof(struct _lowcore, async_enter_timer));
-       DEFINE(__LC_MCCK_ENTER_TIMER, offsetof(struct _lowcore, mcck_enter_timer));
-       DEFINE(__LC_EXIT_TIMER, offsetof(struct _lowcore, exit_timer));
-       DEFINE(__LC_USER_TIMER, offsetof(struct _lowcore, user_timer));
-       DEFINE(__LC_SYSTEM_TIMER, offsetof(struct _lowcore, system_timer));
-       DEFINE(__LC_STEAL_TIMER, offsetof(struct _lowcore, steal_timer));
-       DEFINE(__LC_LAST_UPDATE_TIMER, offsetof(struct _lowcore, last_update_timer));
-       DEFINE(__LC_LAST_UPDATE_CLOCK, offsetof(struct _lowcore, last_update_clock));
-       DEFINE(__LC_CURRENT, offsetof(struct _lowcore, current_task));
-       DEFINE(__LC_CURRENT_PID, offsetof(struct _lowcore, current_pid));
-       DEFINE(__LC_THREAD_INFO, offsetof(struct _lowcore, thread_info));
-       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_KERNEL_ASCE, offsetof(struct _lowcore, kernel_asce));
-       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_DUMP_REIPL, offsetof(struct _lowcore, ipib));
+       /* hardware defined lowcore locations 0x000 - 0x1ff */
+       OFFSET(__LC_EXT_PARAMS, _lowcore, ext_params);
+       OFFSET(__LC_EXT_CPU_ADDR, _lowcore, ext_cpu_addr);
+       OFFSET(__LC_EXT_INT_CODE, _lowcore, ext_int_code);
+       OFFSET(__LC_SVC_ILC, _lowcore, svc_ilc);
+       OFFSET(__LC_SVC_INT_CODE, _lowcore, svc_code);
+       OFFSET(__LC_PGM_ILC, _lowcore, pgm_ilc);
+       OFFSET(__LC_PGM_INT_CODE, _lowcore, pgm_code);
+       OFFSET(__LC_DATA_EXC_CODE, _lowcore, data_exc_code);
+       OFFSET(__LC_MON_CLASS_NR, _lowcore, mon_class_num);
+       OFFSET(__LC_PER_CODE, _lowcore, per_code);
+       OFFSET(__LC_PER_ATMID, _lowcore, per_atmid);
+       OFFSET(__LC_PER_ADDRESS, _lowcore, per_address);
+       OFFSET(__LC_EXC_ACCESS_ID, _lowcore, exc_access_id);
+       OFFSET(__LC_PER_ACCESS_ID, _lowcore, per_access_id);
+       OFFSET(__LC_OP_ACCESS_ID, _lowcore, op_access_id);
+       OFFSET(__LC_AR_MODE_ID, _lowcore, ar_mode_id);
+       OFFSET(__LC_TRANS_EXC_CODE, _lowcore, trans_exc_code);
+       OFFSET(__LC_MON_CODE, _lowcore, monitor_code);
+       OFFSET(__LC_SUBCHANNEL_ID, _lowcore, subchannel_id);
+       OFFSET(__LC_SUBCHANNEL_NR, _lowcore, subchannel_nr);
+       OFFSET(__LC_IO_INT_PARM, _lowcore, io_int_parm);
+       OFFSET(__LC_IO_INT_WORD, _lowcore, io_int_word);
+       OFFSET(__LC_STFL_FAC_LIST, _lowcore, stfl_fac_list);
+       OFFSET(__LC_MCCK_CODE, _lowcore, mcck_interruption_code);
+       OFFSET(__LC_MCCK_FAIL_STOR_ADDR, _lowcore, failing_storage_address);
+       OFFSET(__LC_LAST_BREAK, _lowcore, breaking_event_addr);
+       OFFSET(__LC_RST_OLD_PSW, _lowcore, restart_old_psw);
+       OFFSET(__LC_EXT_OLD_PSW, _lowcore, external_old_psw);
+       OFFSET(__LC_SVC_OLD_PSW, _lowcore, svc_old_psw);
+       OFFSET(__LC_PGM_OLD_PSW, _lowcore, program_old_psw);
+       OFFSET(__LC_MCK_OLD_PSW, _lowcore, mcck_old_psw);
+       OFFSET(__LC_IO_OLD_PSW, _lowcore, io_old_psw);
+       OFFSET(__LC_RST_NEW_PSW, _lowcore, restart_psw);
+       OFFSET(__LC_EXT_NEW_PSW, _lowcore, external_new_psw);
+       OFFSET(__LC_SVC_NEW_PSW, _lowcore, svc_new_psw);
+       OFFSET(__LC_PGM_NEW_PSW, _lowcore, program_new_psw);
+       OFFSET(__LC_MCK_NEW_PSW, _lowcore, mcck_new_psw);
+       OFFSET(__LC_IO_NEW_PSW, _lowcore, io_new_psw);
+       /* software defined lowcore locations 0x200 - 0xdff*/
+       OFFSET(__LC_SAVE_AREA_SYNC, _lowcore, save_area_sync);
+       OFFSET(__LC_SAVE_AREA_ASYNC, _lowcore, save_area_async);
+       OFFSET(__LC_SAVE_AREA_RESTART, _lowcore, save_area_restart);
+       OFFSET(__LC_CPU_FLAGS, _lowcore, cpu_flags);
+       OFFSET(__LC_RETURN_PSW, _lowcore, return_psw);
+       OFFSET(__LC_RETURN_MCCK_PSW, _lowcore, return_mcck_psw);
+       OFFSET(__LC_SYNC_ENTER_TIMER, _lowcore, sync_enter_timer);
+       OFFSET(__LC_ASYNC_ENTER_TIMER, _lowcore, async_enter_timer);
+       OFFSET(__LC_MCCK_ENTER_TIMER, _lowcore, mcck_enter_timer);
+       OFFSET(__LC_EXIT_TIMER, _lowcore, exit_timer);
+       OFFSET(__LC_USER_TIMER, _lowcore, user_timer);
+       OFFSET(__LC_SYSTEM_TIMER, _lowcore, system_timer);
+       OFFSET(__LC_STEAL_TIMER, _lowcore, steal_timer);
+       OFFSET(__LC_LAST_UPDATE_TIMER, _lowcore, last_update_timer);
+       OFFSET(__LC_LAST_UPDATE_CLOCK, _lowcore, last_update_clock);
+       OFFSET(__LC_INT_CLOCK, _lowcore, int_clock);
+       OFFSET(__LC_MCCK_CLOCK, _lowcore, mcck_clock);
+       OFFSET(__LC_CURRENT, _lowcore, current_task);
+       OFFSET(__LC_THREAD_INFO, _lowcore, thread_info);
+       OFFSET(__LC_KERNEL_STACK, _lowcore, kernel_stack);
+       OFFSET(__LC_ASYNC_STACK, _lowcore, async_stack);
+       OFFSET(__LC_PANIC_STACK, _lowcore, panic_stack);
+       OFFSET(__LC_RESTART_STACK, _lowcore, restart_stack);
+       OFFSET(__LC_RESTART_FN, _lowcore, restart_fn);
+       OFFSET(__LC_RESTART_DATA, _lowcore, restart_data);
+       OFFSET(__LC_RESTART_SOURCE, _lowcore, restart_source);
+       OFFSET(__LC_USER_ASCE, _lowcore, user_asce);
+       OFFSET(__LC_CURRENT_PID, _lowcore, current_pid);
+       OFFSET(__LC_PERCPU_OFFSET, _lowcore, percpu_offset);
+       OFFSET(__LC_VDSO_PER_CPU, _lowcore, vdso_per_cpu_data);
+       OFFSET(__LC_MACHINE_FLAGS, _lowcore, machine_flags);
+       OFFSET(__LC_GMAP, _lowcore, gmap);
+       OFFSET(__LC_PASTE, _lowcore, paste);
+       /* software defined ABI-relevant lowcore locations 0xe00 - 0xe20 */
+       OFFSET(__LC_DUMP_REIPL, _lowcore, ipib);
+       /* hardware defined lowcore locations 0x1000 - 0x18ff */
+       OFFSET(__LC_VX_SAVE_AREA_ADDR, _lowcore, vector_save_area_addr);
+       OFFSET(__LC_EXT_PARAMS2, _lowcore, ext_params2);
+       OFFSET(SAVE_AREA_BASE, _lowcore, floating_pt_save_area);
+       OFFSET(__LC_FPREGS_SAVE_AREA, _lowcore, floating_pt_save_area);
+       OFFSET(__LC_GPREGS_SAVE_AREA, _lowcore, gpregs_save_area);
+       OFFSET(__LC_PSW_SAVE_AREA, _lowcore, psw_save_area);
+       OFFSET(__LC_PREFIX_SAVE_AREA, _lowcore, prefixreg_save_area);
+       OFFSET(__LC_FP_CREG_SAVE_AREA, _lowcore, fpt_creg_save_area);
+       OFFSET(__LC_CPU_TIMER_SAVE_AREA, _lowcore, cpu_timer_save_area);
+       OFFSET(__LC_CLOCK_COMP_SAVE_AREA, _lowcore, clock_comp_save_area);
+       OFFSET(__LC_AREGS_SAVE_AREA, _lowcore, access_regs_save_area);
+       OFFSET(__LC_CREGS_SAVE_AREA, _lowcore, cregs_save_area);
+       OFFSET(__LC_PGM_TDB, _lowcore, pgm_tdb);
        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));
-       DEFINE(__LC_PREFIX_SAVE_AREA, offsetof(struct _lowcore, prefixreg_save_area));
-       DEFINE(__LC_AREGS_SAVE_AREA, offsetof(struct _lowcore, access_regs_save_area));
-       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_DATA_EXC_CODE, offsetof(struct _lowcore, data_exc_code));
-       DEFINE(__LC_MCCK_FAIL_STOR_ADDR, offsetof(struct _lowcore, failing_storage_address));
-       DEFINE(__LC_VX_SAVE_AREA_ADDR, offsetof(struct _lowcore, vector_save_area_addr));
-       DEFINE(__LC_EXT_PARAMS2, offsetof(struct _lowcore, ext_params2));
-       DEFINE(SAVE_AREA_BASE, offsetof(struct _lowcore, floating_pt_save_area));
-       DEFINE(__LC_PASTE, offsetof(struct _lowcore, paste));
-       DEFINE(__LC_FP_CREG_SAVE_AREA, offsetof(struct _lowcore, fpt_creg_save_area));
-       DEFINE(__LC_LAST_BREAK, offsetof(struct _lowcore, breaking_event_addr));
-       DEFINE(__LC_PERCPU_OFFSET, offsetof(struct _lowcore, percpu_offset));
-       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(__GMAP_ASCE, offsetof(struct gmap, asce));
-       DEFINE(__SIE_PROG0C, offsetof(struct kvm_s390_sie_block, prog0c));
-       DEFINE(__SIE_PROG20, offsetof(struct kvm_s390_sie_block, prog20));
+       /* gmap/sie offsets */
+       OFFSET(__GMAP_ASCE, gmap, asce);
+       OFFSET(__SIE_PROG0C, kvm_s390_sie_block, prog0c);
+       OFFSET(__SIE_PROG20, kvm_s390_sie_block, prog20);
        return 0;
 }