Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

[powerpc.git] / mm / memory.c

diff --git a/mm/memory.c b/mm/memory.c
index 8d8f525..0ec7bc6 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -87,7 +87,7 @@ int randomize_va_space __read_mostly = 1;
 static int __init disable_randmaps(char *s)
 {
        randomize_va_space = 0;
-       return 0;
+       return 1;
 }
 __setup("norandmaps", disable_randmaps);