From c8ac429226f86e1f9723d32df819f83323fc1c79 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 12 Jan 2011 09:55:24 +0100 Subject: [PATCH] --- yaml --- r: 230967 b: refs/heads/master c: e7828bbd5e8b7c8d6480d1eb744af821989ca432 h: refs/heads/master i: 230965: 9c09c65b5736c65a5d36e832f2609cd920e549cd 230963: 116af82f30ed085959aba176280e4020d89c02cc 230959: f2774f6575f229404b3b62dcf2c9842ce03e322f v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/vdso.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9b401a57f55e..471da25805a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e78a13bfb1640c058fde9dabfd386b942539018 +refs/heads/master: e7828bbd5e8b7c8d6480d1eb744af821989ca432 diff --git a/trunk/arch/s390/kernel/vdso.c b/trunk/arch/s390/kernel/vdso.c index e3150dd2fe74..f438d74dedbd 100644 --- a/trunk/arch/s390/kernel/vdso.c +++ b/trunk/arch/s390/kernel/vdso.c @@ -203,7 +203,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) if (!uses_interp) return 0; - vdso_base = mm->mmap_base; #ifdef CONFIG_64BIT vdso_pagelist = vdso64_pagelist; vdso_pages = vdso64_pages; @@ -233,8 +232,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) * fail and end up putting it elsewhere. */ down_write(&mm->mmap_sem); - vdso_base = get_unmapped_area(NULL, vdso_base, - vdso_pages << PAGE_SHIFT, 0, 0); + vdso_base = get_unmapped_area(NULL, 0, vdso_pages << PAGE_SHIFT, 0, 0); if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto out_up;