[S390] Use alternative user-copy operations for new hardware.

[linux-2.6-omap-h63xx.git] / arch / s390 / kernel / setup.c

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index e229af59976c5aa4d3c389b59d10d78228bf7445..e3d9325f6022b04e3bf307bdc3549362231c75ea 100644 (file)
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -647,7 +647,11 @@ setup_arch(char **cmdline_p)
 
        memory_end = memory_size;
 
-       memcpy(&uaccess, &uaccess_std, sizeof(uaccess));
+       if (MACHINE_HAS_MVCOS)
+               memcpy(&uaccess, &uaccess_mvcos, sizeof(uaccess));
+       else
+               memcpy(&uaccess, &uaccess_std, sizeof(uaccess));
+
        parse_early_param();
 
 #ifndef CONFIG_64BIT