diff options
author | Andy Lutomirski <luto@amacapital.net> | 2014-05-05 15:19:32 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-05 16:18:40 -0400 |
commit | 3d7ee969bffcc984c8aeaffc6ac6816fd929ace1 (patch) | |
tree | 7f365d4f40885740ac0007d030f890ec0b69fb85 /arch/x86/vdso/vma.c | |
parent | 73159fdcdb9be3eda61b846864352c29371baeb6 (diff) |
x86, vdso: Clean up 32-bit vs 64-bit vdso params
Rather than using 'vdso_enabled' and an awful #define, just call the
parameters vdso32_enabled and vdso64_enabled.
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/87913de56bdcbae3d93917938302fc369b05caee.1399317206.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/vdso/vma.c')
-rw-r--r-- | arch/x86/vdso/vma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c index 1ad102613127..8b790398ed1d 100644 --- a/arch/x86/vdso/vma.c +++ b/arch/x86/vdso/vma.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <asm/page.h> | 17 | #include <asm/page.h> |
18 | 18 | ||
19 | #if defined(CONFIG_X86_64) | 19 | #if defined(CONFIG_X86_64) |
20 | unsigned int __read_mostly vdso_enabled = 1; | 20 | unsigned int __read_mostly vdso64_enabled = 1; |
21 | 21 | ||
22 | DECLARE_VDSO_IMAGE(vdso); | 22 | DECLARE_VDSO_IMAGE(vdso); |
23 | extern unsigned short vdso_sync_cpuid; | 23 | extern unsigned short vdso_sync_cpuid; |
@@ -160,7 +160,7 @@ static int setup_additional_pages(struct linux_binprm *bprm, | |||
160 | unsigned long addr; | 160 | unsigned long addr; |
161 | int ret; | 161 | int ret; |
162 | 162 | ||
163 | if (!vdso_enabled) | 163 | if (!vdso64_enabled) |
164 | return 0; | 164 | return 0; |
165 | 165 | ||
166 | down_write(&mm->mmap_sem); | 166 | down_write(&mm->mmap_sem); |
@@ -203,7 +203,7 @@ int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) | |||
203 | 203 | ||
204 | static __init int vdso_setup(char *s) | 204 | static __init int vdso_setup(char *s) |
205 | { | 205 | { |
206 | vdso_enabled = simple_strtoul(s, NULL, 0); | 206 | vdso64_enabled = simple_strtoul(s, NULL, 0); |
207 | return 0; | 207 | return 0; |
208 | } | 208 | } |
209 | __setup("vdso=", vdso_setup); | 209 | __setup("vdso=", vdso_setup); |