summaryrefslogtreecommitdiff
path: root/arch/x86/vdso
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2012-02-21 14:32:19 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2012-02-21 14:32:19 -0800
commit22e842d4d90ffec9677cc114487a5cefd39b5643 (patch)
tree2a970b461d185a27bbd1a00b8d13e5b572e928f1 /arch/x86/vdso
parent1a21d4e095ef720abf81299000afc038206d571b (diff)
downloadlinux-3.10-22e842d4d90ffec9677cc114487a5cefd39b5643.tar.gz
linux-3.10-22e842d4d90ffec9677cc114487a5cefd39b5643.tar.bz2
linux-3.10-22e842d4d90ffec9677cc114487a5cefd39b5643.zip
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>
Diffstat (limited to 'arch/x86/vdso')
-rw-r--r--arch/x86/vdso/vdso32-setup.c3
-rw-r--r--arch/x86/vdso/vma.c8
2 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index 01b8a0df5e0..10f9f59477d 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 1bbcc6205ac..d7dce1dbf8c 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