Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca04ddbf authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/setup: get rid of MACHINE_HAS_MVCOS machine flag 



MACHINE_HAS_MVCOS is used exactly once when the machine is brought up.
There is no need to cache the flag in the machine_flags.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 211deca6

arch/s390/include/asm/setup.h

+0 −3
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ void create_mem_hole(struct mem_chunk mem_chunk[], unsigned long addr, 
#define MACHINE_FLAG_DIAG44	(1UL << 4)

#define MACHINE_FLAG_IDTE	(1UL << 5)

#define MACHINE_FLAG_DIAG9C	(1UL << 6)

#define MACHINE_FLAG_MVCOS	(1UL << 7)

#define MACHINE_FLAG_KVM	(1UL << 8)

#define MACHINE_FLAG_ESOP	(1UL << 9)

#define MACHINE_FLAG_EDAT1	(1UL << 10)
@@ -85,7 +84,6 @@ void create_mem_hole(struct mem_chunk mem_chunk[], unsigned long addr, 
#define MACHINE_HAS_IDTE	(0)

#define MACHINE_HAS_DIAG44	(1)

#define MACHINE_HAS_MVPG	(S390_lowcore.machine_flags & MACHINE_FLAG_MVPG)

#define MACHINE_HAS_MVCOS	(0)

#define MACHINE_HAS_EDAT1	(0)

#define MACHINE_HAS_EDAT2	(0)

#define MACHINE_HAS_LPP		(0)
@@ -98,7 +96,6 @@ void create_mem_hole(struct mem_chunk mem_chunk[], unsigned long addr, 
#define MACHINE_HAS_IDTE	(S390_lowcore.machine_flags & MACHINE_FLAG_IDTE)

#define MACHINE_HAS_DIAG44	(S390_lowcore.machine_flags & MACHINE_FLAG_DIAG44)

#define MACHINE_HAS_MVPG	(1)

#define MACHINE_HAS_MVCOS	(S390_lowcore.machine_flags & MACHINE_FLAG_MVCOS)

#define MACHINE_HAS_EDAT1	(S390_lowcore.machine_flags & MACHINE_FLAG_EDAT1)

#define MACHINE_HAS_EDAT2	(S390_lowcore.machine_flags & MACHINE_FLAG_EDAT2)

#define MACHINE_HAS_LPP		(S390_lowcore.machine_flags & MACHINE_FLAG_LPP)

arch/s390/kernel/early.c

+0 −2
Original line number Diff line number Diff line
@@ -380,8 +380,6 @@ static __init void detect_machine_facilities(void) 
		S390_lowcore.machine_flags |= MACHINE_FLAG_EDAT2;

	if (test_facility(3))

		S390_lowcore.machine_flags |= MACHINE_FLAG_IDTE;

	if (test_facility(27))

		S390_lowcore.machine_flags |= MACHINE_FLAG_MVCOS;

	if (test_facility(40))

		S390_lowcore.machine_flags |= MACHINE_FLAG_LPP;

	if (test_facility(50) && test_facility(73))

arch/s390/lib/uaccess_mvcos.c

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/errno.h>

#include <linux/init.h>

#include <linux/mm.h>

#include <asm/facility.h>

#include <asm/uaccess.h>

#include <asm/futex.h>

#include "uaccess.h"
@@ -242,7 +243,7 @@ EXPORT_SYMBOL(__strncpy_from_user); 


static int __init uaccess_init(void)

{

	if (!MACHINE_HAS_MVCOS)

	if (IS_ENABLED(CONFIG_32BIT) || !test_facility(27))

		static_key_slow_dec(&have_mvcos);

	return 0;

}