[tip:x86/x32] x32: Fix coding style violations in the x32 VDSO code

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


Commit-ID:  22e842d4d90ffec9677cc114487a5cefd39b5643
Gitweb:     http://git.kernel.org/tip/22e842d4d90ffec9677cc114487a5cefd39b5643
Author:     H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
AuthorDate: Tue, 21 Feb 2012 14:32:19 -0800
Committer:  H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
CommitDate: Tue, 21 Feb 2012 14:32:19 -0800

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@xxxxxxxxxxxxxxx>
Cc: H. J. Lu <hjl.tools@xxxxxxxxx>
---
 arch/x86/include/asm/elf.h   |    2 ++
 arch/x86/vdso/vdso32-setup.c |    3 +--
 arch/x86/vdso/vma.c          |    8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
index 83aabea..1e40634 100644
--- 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 01b8a0d..10f9f59 100644
--- 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 1bbcc62..d7dce1d 100644
--- 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
 
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Linux USB Devel]     [Linux Video &Media]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]     [Yosemite Photos]     [Free Online Dating]     [Linux Kernel]     [Linux SCSI]     [XFree86]

Powered by Linux