summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2014-05-27 09:40:26 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-05-27 10:26:05 +0200
commit0c91f98e28d2d123037ff59366ab7e1bca3e1276 (patch)
treec4a1634e0783d1d772b51a4339f2e6376773b4b8 /arch
parents390/boot: fix boot of compressed kernel built with gcc 4.9 (diff)
downloadlinux-0c91f98e28d2d123037ff59366ab7e1bca3e1276.tar.xz
linux-0c91f98e28d2d123037ff59366ab7e1bca3e1276.zip
s390: require mvcos facility for z10 and newer machines
With inlined uaccess functions we always need the mvcos facility. Checking at each inline place if mvcos is available would make the inlining of get_user/put_user pointless. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/kernel/head.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index 429afcc480cb..37579ad79347 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -437,11 +437,11 @@ ENTRY(startup_kdump)
#if defined(CONFIG_64BIT)
#if defined(CONFIG_MARCH_ZEC12)
- .long 3, 0xc100efe3, 0xf46ce800, 0x00400000
+ .long 3, 0xc100efeb, 0xf46ce800, 0x00400000
#elif defined(CONFIG_MARCH_Z196)
- .long 2, 0xc100efe3, 0xf46c0000
+ .long 2, 0xc100efeb, 0xf46c0000
#elif defined(CONFIG_MARCH_Z10)
- .long 2, 0xc100efe3, 0xf0680000
+ .long 2, 0xc100efeb, 0xf0680000
#elif defined(CONFIG_MARCH_Z9_109)
.long 1, 0xc100efc3
#elif defined(CONFIG_MARCH_Z990)