mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-26 19:00:25 +00:00
Code Issues Releases Wiki Activity

x32: Fix coding style violations in the x32 VDSO code

Browse source 
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>
This commit is contained in:
H. Peter Anvin 2012-02-21 14:32:19 -08:00
parent 1a21d4e095
commit 22e842d4d9
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/include/asm/elf.h
View file

@ -331,6 +331,8 @@ struct linux_binprm;
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
extern int arch_setup_additional_pages(struct linux_binprm *bprm, extern int arch_setup_additional_pages(struct linux_binprm *bprm,
int uses_interp); 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); extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
#define compat_arch_setup_additional_pages syscall32_setup_pages #define compat_arch_setup_additional_pages syscall32_setup_pages

3
arch/x86/vdso/vdso32-setup.c
View file

@ -318,9 +318,8 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
bool compat; bool compat;
#ifdef CONFIG_X86_X32_ABI #ifdef CONFIG_X86_X32_ABI
extern int x32_setup_additional_pages(struct linux_binprm *, int);
if (test_thread_flag(TIF_X32)) if (test_thread_flag(TIF_X32))
return x32_setup_additional_pages (bprm, uses_interp); return x32_setup_additional_pages(bprm, uses_interp);
#endif #endif
if (vdso_enabled == VDSO_DISABLED) if (vdso_enabled == VDSO_DISABLED)

8
arch/x86/vdso/vma.c
View file

@ -187,15 +187,15 @@ static int setup_additional_pages(struct linux_binprm *bprm,
int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
{ {
return setup_additional_pages (bprm, uses_interp, vdso_pages, return setup_additional_pages(bprm, uses_interp, vdso_pages,
vdso_size); vdso_size);
} }
#ifdef CONFIG_X86_X32_ABI #ifdef CONFIG_X86_X32_ABI
int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
{ {
return setup_additional_pages (bprm, uses_interp, vdsox32_pages, return setup_additional_pages(bprm, uses_interp, vdsox32_pages,
vdsox32_size); vdsox32_size);
} }
#endif #endif