Metag architecture changes for v4.1

Just the one change for v4.1-rc1. A minor cleanup of copy_thread().
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJVOPxYAAoJEGwLaZPeOHZ6g7EQAI4E+v160qzMBFuXp4A8DbcX
 5I33jwzIm38vJ7bT07ba0VwBUr7g2tvPBgfdJezjiOPPUfcq+9jvNb+qbX892UFN
 lpvtvKyyu4ZZ7wRfcUU1Vs3VVAHB5H3iEBc9PBdsm78ai8CoLNuRX6gySOUVScqc
 qZwPMK/F/z8yJCKKSg/gljbAGulyszV1LHLvphRtBivNBLCKand3Bk2lpFUkXrjp
 Z3CT5zEZoWip/Xx5p568VDLSrY4z3hD5XHmFUv/Xo1vXi+IHvfszvtFfHIstDNzG
 77uVUKzQhLvhH+mXC0lLD0VjDeE307nKLusVWpECg4rV5i4Xpv6Yye77dFTzqI+T
 wyW0nHDSHWkvdJA4rUjFcS8nuwy3qZvkGGPesC3PuFTwfvefS9DKtSJZqn9GBsPi
 uFb0wxYHh91XTQ5xhnbQLihg8vHtodHAApeQ5pv4rVakK7vIyx+D5wiLP8IYxp2j
 IMQCQfwoQaPBOVr5ri/FMWDr1vhSqdzNIN3kxlAFv2dV9KiOCG3aTzOZVLvwqlCH
 WEPpPmFaEoblENwTuJvMyQ7QCUVx/sDDw/2nvd2k6RSLj+0voqmNi17kGZ0V2fTe
 XYVX41Fvb2ppR9GklMoFMydv7weYz/1chCWNEAEv3iLgD+6Yi31DEmKh1KZgmhdZ
 VuHxBxFpD3Y6/SJnWvpu
 =XxGr
 -----END PGP SIGNATURE-----

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'
This commit is contained in:
Linus Torvalds 2015-04-24 07:56:50 -07:00
Родитель c76397e930 40346a0327
Коммит fab1e5502c
1 изменённых файлов: 7 добавлений и 3 удалений

Просмотреть файл

@ -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.