diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-11-16 04:03:33 (GMT) |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-11-16 04:03:33 (GMT) |
commit | 56f4a560c6d6318b5a8e18a1b3e44909a5158d1e (patch) | |
tree | 3193b43eebd2cde7b13de9eb4b37cb5a1dccfdd0 /arch/s390/kernel/early.c | |
parent | 3871608e4cb995b0fb9c630da9ac45b246151fef (diff) | |
parent | 9b609ba2c2df8290054e5c62be69101b43e2a976 (diff) | |
download | linux-56f4a560c6d6318b5a8e18a1b3e44909a5158d1e.tar.xz |
Merge tag 'v4.9.62' into linux-linaro-lsk-v4.9
This is the 4.9.62 stable release
Diffstat (limited to 'arch/s390/kernel/early.c')
-rw-r--r-- | arch/s390/kernel/early.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c index 2374c5b..0c19686 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c @@ -363,6 +363,18 @@ static inline void save_vector_registers(void) #endif } +static int __init topology_setup(char *str) +{ + bool enabled; + int rc; + + rc = kstrtobool(str, &enabled); + if (!rc && !enabled) + S390_lowcore.machine_flags &= ~MACHINE_HAS_TOPOLOGY; + return rc; +} +early_param("topology", topology_setup); + static int __init disable_vector_extension(char *str) { S390_lowcore.machine_flags &= ~MACHINE_FLAG_VX; |