From 7da15eaf485bac43d4b5317bdb4129f3a654adf4 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 26 Jul 2007 10:41:12 -0700 Subject: [PATCH] --- yaml --- r: 62992 b: refs/heads/master c: 2ebc3cc920e7a076539aa8badbaf0919540a3438 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/ia32/ia32_binfmt.c | 5 +++-- trunk/arch/x86_64/ia32/syscall32.c | 8 -------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index cc5303a0e5cc..aa6d9b599a55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26b97237f7eee977eb8beb59adbbf0a8ab4f8276 +refs/heads/master: 2ebc3cc920e7a076539aa8badbaf0919540a3438 diff --git a/trunk/arch/x86_64/ia32/ia32_binfmt.c b/trunk/arch/x86_64/ia32/ia32_binfmt.c index b70f3e7cf06c..dffd2ac72747 100644 --- a/trunk/arch/x86_64/ia32/ia32_binfmt.c +++ b/trunk/arch/x86_64/ia32/ia32_binfmt.c @@ -41,8 +41,9 @@ int sysctl_vsyscall32 = 1; #undef ARCH_DLINFO #define ARCH_DLINFO do { \ if (sysctl_vsyscall32) { \ - NEW_AUX_ENT(AT_SYSINFO, (u32)(u64)VSYSCALL32_VSYSCALL); \ - NEW_AUX_ENT(AT_SYSINFO_EHDR, VSYSCALL32_BASE); \ + current->mm->context.vdso = (void *)VSYSCALL32_BASE; \ + NEW_AUX_ENT(AT_SYSINFO, (u32)(u64)VSYSCALL32_VSYSCALL); \ + NEW_AUX_ENT(AT_SYSINFO_EHDR, VSYSCALL32_BASE); \ } \ } while(0) diff --git a/trunk/arch/x86_64/ia32/syscall32.c b/trunk/arch/x86_64/ia32/syscall32.c index fc4419ff0355..15013bac181c 100644 --- a/trunk/arch/x86_64/ia32/syscall32.c +++ b/trunk/arch/x86_64/ia32/syscall32.c @@ -49,14 +49,6 @@ int syscall32_setup_pages(struct linux_binprm *bprm, int exstack) return ret; } -const char *arch_vma_name(struct vm_area_struct *vma) -{ - if (vma->vm_start == VSYSCALL32_BASE && - vma->vm_mm && vma->vm_mm->task_size == IA32_PAGE_OFFSET) - return "[vdso]"; - return NULL; -} - static int __init init_syscall32(void) { char *syscall32_page = (void *)get_zeroed_page(GFP_KERNEL);