OSDN Git Service

s390/facilities: remove transactional-execution bits
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Thu, 13 Aug 2015 10:27:16 +0000 (12:27 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Wed, 19 Aug 2015 08:03:34 +0000 (10:03 +0200)
Remove the two facility bits

50 - constrained transactional-execution facility
74 - transactional-execution facility

from the required facilities if the kernel is built with -march=zEC12.

E.g. z/VM 6.3 doesn't virtualize the TX facility yet. Therefore a kernel
built with -march=zEC12 and ipl'ed on a zEC12 machine as a z/VM 6.3 guest
will emit a message about the missing facilities and stop working.

The kernel however doesn't make use of the TX facility, therefore remove
the two TX related facility bits and fix this unpleasant behavior.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/kernel/head.S

index 63c77fd..1255c6c 100644 (file)
@@ -414,9 +414,9 @@ ENTRY(startup_kdump)
 # followed by the facility words.
 
 #if defined(CONFIG_MARCH_Z13)
-       .long 3, 0xc100eff2, 0xf46ce800, 0x00400000
+       .long 2, 0xc100eff2, 0xf46cc800
 #elif defined(CONFIG_MARCH_ZEC12)
-       .long 3, 0xc100eff2, 0xf46ce800, 0x00400000
+       .long 2, 0xc100eff2, 0xf46cc800
 #elif defined(CONFIG_MARCH_Z196)
        .long 2, 0xc100eff2, 0xf46c0000
 #elif defined(CONFIG_MARCH_Z10)