提交 22e842d4 编写于 作者: H H. Peter Anvin

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: NH. Peter Anvin <hpa@linux.intel.com>
Cc: H. J. Lu <hjl.tools@gmail.com>
上级 1a21d4e0
...@@ -331,6 +331,8 @@ struct linux_binprm; ...@@ -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
......
...@@ -318,9 +318,8 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) ...@@ -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)
......
...@@ -187,15 +187,15 @@ static int setup_additional_pages(struct linux_binprm *bprm, ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册