Commit c667aeac authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390: rename struct _lowcore to struct lowcore 



Finally get rid of the leading underscore. I tried this already two or
three years ago, however Michael Holzheu objected since this would
break the crash utility (again).

However Michael integrated support for the new name into the crash
utility back then, so it doesn't break if the name will be changed
now.  So finally get rid of the ever confusing leading underscore.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 423d5b36

arch/s390/include/asm/lowcore.h

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#define LC_ORDER 1

#define LC_PAGES 2



struct _lowcore {

struct lowcore {

	__u8	pad_0x0000[0x0014-0x0000];	/* 0x0000 */

	__u32	ipl_parmblock_ptr;		/* 0x0014 */

	__u8	pad_0x0018[0x0080-0x0018];	/* 0x0018 */
@@ -183,9 +183,9 @@ struct _lowcore { 
	__u8	vector_save_area[1024];		/* 0x1c00 */

} __packed;



#define S390_lowcore (*((struct _lowcore *) 0))

#define S390_lowcore (*((struct lowcore *) 0))



extern struct _lowcore *lowcore_ptr[];

extern struct lowcore *lowcore_ptr[];



static inline void set_prefix(__u32 address)

{

arch/s390/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static inline int test_cpu_flag(int flag) 
 */

static inline int test_cpu_flag_of(int flag, int cpu)

{

	struct _lowcore *lc = lowcore_ptr[cpu];

	struct lowcore *lc = lowcore_ptr[cpu];

	return !!(lc->cpu_flags & (1UL << flag));

}

arch/s390/include/asm/vdso.h

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ struct vdso_per_cpu_data { 


extern struct vdso_data *vdso_data;



int vdso_alloc_per_cpu(struct _lowcore *lowcore);

void vdso_free_per_cpu(struct _lowcore *lowcore);

int vdso_alloc_per_cpu(struct lowcore *lowcore);

void vdso_free_per_cpu(struct lowcore *lowcore);



#endif /* __ASSEMBLY__ */

#endif /* __S390_VDSO_H__ */

arch/s390/kernel/asm-offsets.c

+87 −87
Original line number Diff line number Diff line
@@ -97,96 +97,96 @@ int main(void) 
	OFFSET(__TIMER_IDLE_EXIT, s390_idle_data, timer_idle_exit);

	BLANK();

	/* 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_STFLE_FAC_LIST, _lowcore, stfle_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);

	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_STFLE_FAC_LIST, lowcore, stfle_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_LPP, _lowcore, lpp);

	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);

	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_LPP, lowcore, lpp);

	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);

	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(__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_TOD_PROGREG_SAVE_AREA, _lowcore, tod_progreg_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);

	OFFSET(__LC_VX_SAVE_AREA_ADDR, lowcore, vector_save_area_addr);

	OFFSET(__LC_EXT_PARAMS2, lowcore, ext_params2);

	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_TOD_PROGREG_SAVE_AREA, lowcore, tod_progreg_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();

	/* gmap/sie offsets */

	OFFSET(__GMAP_ASCE, gmap, asce);

arch/s390/kernel/crash_dump.c

+2 −2
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ struct save_area * __init save_area_boot_cpu(void) 
 */

void __init save_area_add_regs(struct save_area *sa, void *regs)

{

	struct _lowcore *lc;

	struct lowcore *lc;



	lc = (struct _lowcore *)(regs - __LC_FPREGS_SAVE_AREA);

	lc = (struct lowcore *)(regs - __LC_FPREGS_SAVE_AREA);

	memcpy(&sa->psw, &lc->psw_save_area, sizeof(sa->psw));

	memcpy(&sa->ctrs, &lc->cregs_save_area, sizeof(sa->ctrs));

	memcpy(&sa->gprs, &lc->gpregs_save_area, sizeof(sa->gprs));

CRA Git | Maintained and supported by SUSTech CRA and CCSE