Commit 6450578f authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] ia64: task_pt_regs() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ab03591d

arch/ia64/ia32/elfcore32.h

+1 −2
Original line number Diff line number Diff line
@@ -95,8 +95,7 @@ static inline void elf_core_copy_regs(elf_gregset_t *elfregs, 
static inline int elf_core_copy_task_regs(struct task_struct *t,

					  elf_gregset_t* elfregs)

{

	struct pt_regs *pp = ia64_task_regs(t);

	ELF_CORE_COPY_REGS((*elfregs), pp);

	ELF_CORE_COPY_REGS((*elfregs), task_pt_regs(t));

	return 1;

}

arch/ia64/ia32/ia32_signal.c

+2 −2
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ save_ia32_fpstate_live (struct _fpstate_ia32 __user *save) 
	 */

	fp_tos = (fsr>>11)&0x7;

	fr8_st_map = (8-fp_tos)&0x7;

	ptp = ia64_task_regs(tsk);

	ptp = task_pt_regs(tsk);

	fpregp = (struct _fpreg_ia32 *)(((unsigned long)buf + 15) & ~15);

	ia64f2ia32f(fpregp, &ptp->f8);

	copy_to_user(&save->_st[(0+fr8_st_map)&0x7], fpregp, sizeof(struct _fpreg_ia32));
@@ -389,7 +389,7 @@ restore_ia32_fpstate_live (struct _fpstate_ia32 __user *save) 
	fr8_st_map = (8-fp_tos)&0x7;

	fpregp = (struct _fpreg_ia32 *)(((unsigned long)buf + 15) & ~15);



	ptp = ia64_task_regs(tsk);

	ptp = task_pt_regs(tsk);

	copy_from_user(fpregp, &save->_st[(0+fr8_st_map)&0x7], sizeof(struct _fpreg_ia32));

	ia32f2ia64f(&ptp->f8, fpregp);

	copy_from_user(fpregp, &save->_st[(1+fr8_st_map)&0x7], sizeof(struct _fpreg_ia32));

arch/ia64/ia32/ia32_support.c

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ load_desc (u16 selector) 
void

ia32_load_segment_descriptors (struct task_struct *task)

{

	struct pt_regs *regs = ia64_task_regs(task);

	struct pt_regs *regs = task_pt_regs(task);



	/* Setup the segment descriptors */

	regs->r24 = load_desc(regs->r16 >> 16);		/* ESD */
@@ -113,7 +113,7 @@ void 
ia32_load_state (struct task_struct *t)

{

	unsigned long eflag, fsr, fcr, fir, fdr, tssd;

	struct pt_regs *regs = ia64_task_regs(t);

	struct pt_regs *regs = task_pt_regs(t);



	eflag = t->thread.eflag;

	fsr = t->thread.fsr;

arch/ia64/ia32/sys_ia32.c

+6 −6
Original line number Diff line number Diff line
@@ -1482,7 +1482,7 @@ getreg (struct task_struct *child, int regno) 
{

	struct pt_regs *child_regs;



	child_regs = ia64_task_regs(child);

	child_regs = task_pt_regs(child);

	switch (regno / sizeof(int)) {

	      case PT_EBX: return child_regs->r11;

	      case PT_ECX: return child_regs->r9;
@@ -1510,7 +1510,7 @@ putreg (struct task_struct *child, int regno, unsigned int value) 
{

	struct pt_regs *child_regs;



	child_regs = ia64_task_regs(child);

	child_regs = task_pt_regs(child);

	switch (regno / sizeof(int)) {

	      case PT_EBX: child_regs->r11 = value; break;

	      case PT_ECX: child_regs->r9 = value; break;
@@ -1626,7 +1626,7 @@ save_ia32_fpstate (struct task_struct *tsk, struct ia32_user_i387_struct __user 
	 *  Stack frames start with 16-bytes of temp space

	 */

	swp = (struct switch_stack *)(tsk->thread.ksp + 16);

	ptp = ia64_task_regs(tsk);

	ptp = task_pt_regs(tsk);

	tos = (tsk->thread.fsr >> 11) & 7;

	for (i = 0; i < 8; i++)

		put_fpreg(i, &save->st_space[i], ptp, swp, tos);
@@ -1659,7 +1659,7 @@ restore_ia32_fpstate (struct task_struct *tsk, struct ia32_user_i387_struct __us 
	 *  Stack frames start with 16-bytes of temp space

	 */

	swp = (struct switch_stack *)(tsk->thread.ksp + 16);

	ptp = ia64_task_regs(tsk);

	ptp = task_pt_regs(tsk);

	tos = (tsk->thread.fsr >> 11) & 7;

	for (i = 0; i < 8; i++)

		get_fpreg(i, &save->st_space[i], ptp, swp, tos);
@@ -1690,7 +1690,7 @@ save_ia32_fpxstate (struct task_struct *tsk, struct ia32_user_fxsr_struct __user 
         *  Stack frames start with 16-bytes of temp space

         */

        swp = (struct switch_stack *)(tsk->thread.ksp + 16);

        ptp = ia64_task_regs(tsk);

        ptp = task_pt_regs(tsk);

	tos = (tsk->thread.fsr >> 11) & 7;

        for (i = 0; i < 8; i++)

		put_fpreg(i, (struct _fpreg_ia32 __user *)&save->st_space[4*i], ptp, swp, tos);
@@ -1734,7 +1734,7 @@ restore_ia32_fpxstate (struct task_struct *tsk, struct ia32_user_fxsr_struct __u 
	 *  Stack frames start with 16-bytes of temp space

	 */

	swp = (struct switch_stack *)(tsk->thread.ksp + 16);

	ptp = ia64_task_regs(tsk);

	ptp = task_pt_regs(tsk);

	tos = (tsk->thread.fsr >> 11) & 7;

	for (i = 0; i < 8; i++)

	get_fpreg(i, (struct _fpreg_ia32 __user *)&save->st_space[4*i], ptp, swp, tos);

arch/ia64/kernel/perfmon.c

+16 −16
Original line number Diff line number Diff line
@@ -1710,7 +1710,7 @@ static void 
pfm_syswide_force_stop(void *info)

{

	pfm_context_t   *ctx = (pfm_context_t *)info;

	struct pt_regs *regs = ia64_task_regs(current);

	struct pt_regs *regs = task_pt_regs(current);

	struct task_struct *owner;

	unsigned long flags;

	int ret;
@@ -1815,7 +1815,7 @@ pfm_flush(struct file *filp) 
	is_system = ctx->ctx_fl_system;



	task = PFM_CTX_TASK(ctx);

	regs = ia64_task_regs(task);

	regs = task_pt_regs(task);



	DPRINT(("ctx_state=%d is_current=%d\n",

		state,
@@ -1945,7 +1945,7 @@ pfm_close(struct inode *inode, struct file *filp) 
	is_system = ctx->ctx_fl_system;



	task = PFM_CTX_TASK(ctx);

	regs = ia64_task_regs(task);

	regs = task_pt_regs(task);



	DPRINT(("ctx_state=%d is_current=%d\n", 

		state,
@@ -4052,7 +4052,7 @@ pfm_stop(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs) 
	 	 */

		ia64_psr(regs)->up = 0;

	} else {

		tregs = ia64_task_regs(task);

		tregs = task_pt_regs(task);



		/*

	 	 * stop monitoring at the user level
@@ -4134,7 +4134,7 @@ pfm_start(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs) 
		ia64_psr(regs)->up = 1;



	} else {

		tregs = ia64_task_regs(ctx->ctx_task);

		tregs = task_pt_regs(ctx->ctx_task);



		/*

		 * start monitoring at the kernel level the next
@@ -4404,7 +4404,7 @@ pfm_context_load(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs) 
		/*

		 * when not current, task MUST be stopped, so this is safe

		 */

		regs = ia64_task_regs(task);

		regs = task_pt_regs(task);



		/* force a full reload */

		ctx->ctx_last_activation = PFM_INVALID_ACTIVATION;
@@ -4530,7 +4530,7 @@ pfm_context_unload(pfm_context_t *ctx, void *arg, int count, struct pt_regs *reg 
	/*

	 * per-task mode

	 */

	tregs = task == current ? regs : ia64_task_regs(task);

	tregs = task == current ? regs : task_pt_regs(task);



	if (task == current) {

		/*
@@ -4593,7 +4593,7 @@ pfm_exit_thread(struct task_struct *task) 
{

	pfm_context_t *ctx;

	unsigned long flags;

	struct pt_regs *regs = ia64_task_regs(task);

	struct pt_regs *regs = task_pt_regs(task);

	int ret, state;

	int free_ok = 0;
@@ -4926,7 +4926,7 @@ sys_perfmonctl (int fd, int cmd, void __user *arg, int count) 
	if (unlikely(ret)) goto abort_locked;



skip_fd:

	ret = (*func)(ctx, args_k, count, ia64_task_regs(current));

	ret = (*func)(ctx, args_k, count, task_pt_regs(current));



	call_made = 1;
@@ -5050,7 +5050,7 @@ pfm_handle_work(void) 


	pfm_clear_task_notify();



	regs = ia64_task_regs(current);

	regs = task_pt_regs(current);



	/*

	 * extract reason for being here and clear
@@ -5794,7 +5794,7 @@ pfm_syst_wide_update_task(struct task_struct *task, unsigned long info, int is_c 
	 * on every CPU, so we can rely on the pid to identify the idle task.

	 */

	if ((info & PFM_CPUINFO_EXCL_IDLE) == 0 || task->pid) {

		regs = ia64_task_regs(task);

		regs = task_pt_regs(task);

		ia64_psr(regs)->pp = is_ctxswin ? dcr_pp : 0;

		return;

	}
@@ -5877,7 +5877,7 @@ pfm_save_regs(struct task_struct *task) 
	flags = pfm_protect_ctx_ctxsw(ctx);



	if (ctx->ctx_state == PFM_CTX_ZOMBIE) {

		struct pt_regs *regs = ia64_task_regs(task);

		struct pt_regs *regs = task_pt_regs(task);



		pfm_clear_psr_up();
@@ -6077,7 +6077,7 @@ pfm_load_regs (struct task_struct *task) 
	BUG_ON(psr & IA64_PSR_I);



	if (unlikely(ctx->ctx_state == PFM_CTX_ZOMBIE)) {

		struct pt_regs *regs = ia64_task_regs(task);

		struct pt_regs *regs = task_pt_regs(task);



		BUG_ON(ctx->ctx_smpl_hdr);
@@ -6446,7 +6446,7 @@ pfm_alt_save_pmu_state(void *data) 
{

	struct pt_regs *regs;



	regs = ia64_task_regs(current);

	regs = task_pt_regs(current);



	DPRINT(("called\n"));
@@ -6472,7 +6472,7 @@ pfm_alt_restore_pmu_state(void *data) 
{

	struct pt_regs *regs;



	regs = ia64_task_regs(current);

	regs = task_pt_regs(current);



	DPRINT(("called\n"));
@@ -6754,7 +6754,7 @@ dump_pmu_state(const char *from) 
	local_irq_save(flags);



	this_cpu = smp_processor_id();

	regs     = ia64_task_regs(current);

	regs     = task_pt_regs(current);

	info     = PFM_CPUINFO_GET();

	dcr      = ia64_getreg(_IA64_REG_CR_DCR);