x32: Fix coding style violations in the x32 VDSO code

Move the prototype for x32_setup_additional_pages() to a header file,
and adjust the coding style to match standard.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: H. J. Lu <hjl.tools@gmail.com>

diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
index 83aabea95dd77cfa482e48cd133db03ab2915cdb..1e40634591a4c48c01aefc2f97a0244227a0fdde 100644 (file)
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
@@ -331,6 +331,8 @@ struct linux_binprm;
 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
                                       int uses_interp);
+extern int x32_setup_additional_pages(struct linux_binprm *bprm,
+                                     int uses_interp);
 
 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
 #define compat_arch_setup_additional_pages     syscall32_setup_pages

diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index 01b8a0df5e0e198d22bf715fdba4e485914828ba..10f9f59477db71cb9e27f4cbaa8e7ca989d06984 100644 (file)
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -318,9 +318,8 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        bool compat;
 
 #ifdef CONFIG_X86_X32_ABI
-       extern int x32_setup_additional_pages(struct linux_binprm *, int);
        if (test_thread_flag(TIF_X32))
-               return x32_setup_additional_pages (bprm, uses_interp);
+               return x32_setup_additional_pages(bprm, uses_interp);
 #endif
 
        if (vdso_enabled == VDSO_DISABLED)

diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
index 1bbcc6205ace7054f144fb84ca6c696de4b73067..d7dce1dbf8c90a118d026bb294c20b35c0347aa2 100644 (file)
--- a/arch/x86/vdso/vma.c
+++ b/arch/x86/vdso/vma.c
@@ -187,15 +187,15 @@ up_fail:
 
 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
 {
-       return setup_additional_pages (bprm, uses_interp, vdso_pages,
-                                      vdso_size);
+       return setup_additional_pages(bprm, uses_interp, vdso_pages,
+                                     vdso_size);
 }
 
 #ifdef CONFIG_X86_X32_ABI
 int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
 {
-       return setup_additional_pages (bprm, uses_interp, vdsox32_pages,
-                                      vdsox32_size);
+       return setup_additional_pages(bprm, uses_interp, vdsox32_pages,
+                                     vdsox32_size);
 }
 #endif