Просмотр исходного кода

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>
H. Peter Anvin 13 лет назад
Родитель
Сommit
22e842d4d9
3 измененных файлов с 7 добавлено и 6 удалено
  1. 2 0
      arch/x86/include/asm/elf.h
  2. 1 2
      arch/x86/vdso/vdso32-setup.c
  3. 4 4
      arch/x86/vdso/vma.c

+ 2 - 0
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

+ 1 - 2
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)

+ 4 - 4
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