| Message ID | 20200623085436.3696-7-will@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix unwinding through sigreturn trampolines | expand |
On Tue, Jun 23, 2020 at 09:54:36AM +0100, Will Deacon wrote: > There's really no need to put every parameter on a new line when calling > a function with a long name, so reformat the *setup_additional_pages() > functions in the vDSO setup code to follow the usual conventions. > > Signed-off-by: Will Deacon <will@kernel.org> Much nicer! Acked-by: Mark Rutland <mark.rutland@arm.com> Mark. > --- > arch/arm64/kernel/vdso.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c > index 30b01c2f50da..bb7997b31650 100644 > --- a/arch/arm64/kernel/vdso.c > +++ b/arch/arm64/kernel/vdso.c > @@ -332,9 +332,7 @@ int aarch32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) > goto out; > > if (IS_ENABLED(CONFIG_COMPAT_VDSO)) { > - ret = __setup_additional_pages(VDSO_ABI_AA32, > - mm, > - bprm, > + ret = __setup_additional_pages(VDSO_ABI_AA32, mm, bprm, > uses_interp); > if (ret) > goto out; > @@ -377,8 +375,7 @@ static int __init vdso_init(void) > } > arch_initcall(vdso_init); > > -int arch_setup_additional_pages(struct linux_binprm *bprm, > - int uses_interp) > +int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) > { > struct mm_struct *mm = current->mm; > int ret; > @@ -386,11 +383,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, > if (mmap_write_lock_killable(mm)) > return -EINTR; > > - ret = __setup_additional_pages(VDSO_ABI_AA64, > - mm, > - bprm, > - uses_interp); > - > + ret = __setup_additional_pages(VDSO_ABI_AA64, mm, bprm, uses_interp); > mmap_write_unlock(mm); > > return ret; > -- > 2.27.0.111.gc72c7da667-goog > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On 6/23/20 9:54 AM, Will Deacon wrote: > There's really no need to put every parameter on a new line when calling > a function with a long name, so reformat the *setup_additional_pages() > functions in the vDSO setup code to follow the usual conventions. > > Signed-off-by: Will Deacon <will@kernel.org> Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com> > --- > arch/arm64/kernel/vdso.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c > index 30b01c2f50da..bb7997b31650 100644 > --- a/arch/arm64/kernel/vdso.c > +++ b/arch/arm64/kernel/vdso.c > @@ -332,9 +332,7 @@ int aarch32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) > goto out; > > if (IS_ENABLED(CONFIG_COMPAT_VDSO)) { > - ret = __setup_additional_pages(VDSO_ABI_AA32, > - mm, > - bprm, > + ret = __setup_additional_pages(VDSO_ABI_AA32, mm, bprm, > uses_interp); > if (ret) > goto out; > @@ -377,8 +375,7 @@ static int __init vdso_init(void) > } > arch_initcall(vdso_init); > > -int arch_setup_additional_pages(struct linux_binprm *bprm, > - int uses_interp) > +int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) > { > struct mm_struct *mm = current->mm; > int ret; > @@ -386,11 +383,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, > if (mmap_write_lock_killable(mm)) > return -EINTR; > > - ret = __setup_additional_pages(VDSO_ABI_AA64, > - mm, > - bprm, > - uses_interp); > - > + ret = __setup_additional_pages(VDSO_ABI_AA64, mm, bprm, uses_interp); > mmap_write_unlock(mm); > > return ret; >
diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 30b01c2f50da..bb7997b31650 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -332,9 +332,7 @@ int aarch32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) goto out; if (IS_ENABLED(CONFIG_COMPAT_VDSO)) { - ret = __setup_additional_pages(VDSO_ABI_AA32, - mm, - bprm, + ret = __setup_additional_pages(VDSO_ABI_AA32, mm, bprm, uses_interp); if (ret) goto out; @@ -377,8 +375,7 @@ static int __init vdso_init(void) } arch_initcall(vdso_init); -int arch_setup_additional_pages(struct linux_binprm *bprm, - int uses_interp) +int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) { struct mm_struct *mm = current->mm; int ret; @@ -386,11 +383,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, if (mmap_write_lock_killable(mm)) return -EINTR; - ret = __setup_additional_pages(VDSO_ABI_AA64, - mm, - bprm, - uses_interp); - + ret = __setup_additional_pages(VDSO_ABI_AA64, mm, bprm, uses_interp); mmap_write_unlock(mm); return ret;
There's really no need to put every parameter on a new line when calling a function with a long name, so reformat the *setup_additional_pages() functions in the vDSO setup code to follow the usual conventions. Signed-off-by: Will Deacon <will@kernel.org> --- arch/arm64/kernel/vdso.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)