Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fab1e550 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'metag-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag 

Pull Metag architecture updates from James Hogan:
 "Just the one change for v4.1-rc1.  A minor cleanup of copy_thread()"

* tag 'metag-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  metag: copy_thread(): rename 'arg' argument to 'kthread_arg'
parents c76397e9 40346a03

arch/metag/kernel/process.c

+7 −3
Original line number Diff line number Diff line
@@ -174,8 +174,11 @@ void show_regs(struct pt_regs *regs) 
	show_trace(NULL, (unsigned long *)regs->ctx.AX[0].U0, regs);

}



/*

 * Copy architecture-specific thread state

 */

int copy_thread(unsigned long clone_flags, unsigned long usp,

		unsigned long arg, struct task_struct *tsk)

		unsigned long kthread_arg, struct task_struct *tsk)

{

	struct pt_regs *childregs = task_pt_regs(tsk);

	void *kernel_context = ((void *) childregs +
@@ -202,12 +205,13 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, 
		global_base = __core_reg_get(A1GbP);

		childregs->ctx.AX[0].U1 = (unsigned long) global_base;

		childregs->ctx.AX[0].U0 = (unsigned long) kernel_context;

		/* Set D1Ar1=arg and D1RtP=usp (fn) */

		/* Set D1Ar1=kthread_arg and D1RtP=usp (fn) */

		childregs->ctx.DX[4].U1 = usp;

		childregs->ctx.DX[3].U1 = arg;

		childregs->ctx.DX[3].U1 = kthread_arg;

		tsk->thread.int_depth = 2;

		return 0;

	}



	/*

	 * Get a pointer to where the new child's register block should have

	 * been pushed.