Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[linux-2.6] / include / asm-ppc64 / vdso.h

diff --git a/include/asm-ppc64/vdso.h b/include/asm-ppc64/vdso.h
index b74e16c0cf0102dfebf0557aad00197c7f103008..85d8a7be25c482a359bee0baf3b96f028f577983 100644 (file)
--- a/include/asm-ppc64/vdso.h
+++ b/include/asm-ppc64/vdso.h
@@ -4,12 +4,12 @@
 #ifdef __KERNEL__
 
 /* Default link addresses for the vDSOs */
-#define VDSO32_LBASE   0
-#define VDSO64_LBASE   0
+#define VDSO32_LBASE   0x100000
+#define VDSO64_LBASE   0x100000
 
 /* Default map addresses */
-#define VDSO32_MBASE   0x100000
-#define VDSO64_MBASE   0x100000
+#define VDSO32_MBASE   VDSO32_LBASE
+#define VDSO64_MBASE   VDSO64_LBASE
 
 #define VDSO_VERSION_STRING    LINUX_2.6.12