diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2012-02-21 14:32:19 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-02-21 14:32:19 -0800 |
| commit | 22e842d4d90ffec9677cc114487a5cefd39b5643 (patch) | |
| tree | 2a970b461d185a27bbd1a00b8d13e5b572e928f1 /arch/x86 | |
| parent | 1a21d4e095ef720abf81299000afc038206d571b (diff) | |
| download | blackbird-op-linux-22e842d4d90ffec9677cc114487a5cefd39b5643.tar.gz blackbird-op-linux-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')
| -rw-r--r-- | arch/x86/include/asm/elf.h | 2 | ||||
| -rw-r--r-- | arch/x86/vdso/vdso32-setup.c | 3 | ||||
| -rw-r--r-- | 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 83aabea95dd7..1e40634591a4 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 01b8a0df5e0e..10f9f59477db 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 1bbcc6205ace..d7dce1dbf8c9 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 |
