2 files changed, 7 insertions, 3 deletions

diff --git a/arch/powerpc/include/asm/vdso.h b/arch/powerpc/include/asm/vdso.h
index 26fc449bd989..dc0419b66f17 100644
--- a/arch/powerpc/include/asm/vdso.h
+++ b/arch/powerpc/include/asm/vdso.h
@@ -7,9 +7,8 @@
 #define VDSO32_LBASE    0x100000
 #define VDSO64_LBASE    0x100000
 
-/* Default map addresses */
+/* Default map addresses for 32bit vDSO */
 #define VDSO32_MBASE    VDSO32_LBASE
-#define VDSO64_MBASE    VDSO64_LBASE
 
 #define VDSO_VERSION_STRING     LINUX_2.6.15
 
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index ad06d5c75b15..a0abce251d0a 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -203,7 +203,12 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
         } else {
                 vdso_pagelist = vdso64_pagelist;
                 vdso_pages = vdso64_pages;
-                vdso_base = VDSO64_MBASE;
+                /*
+                 * On 64bit we don't have a preferred map address. This
+                 * allows get_unmapped_area to find an area near other mmaps
+                 * and most likely share a SLB entry.
+                 */
+                vdso_base = 0;
         }
 #else
         vdso_pagelist = vdso32_pagelist;