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

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

[S390] Move stfl to system.h and delete duplicated version. 



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

arch/s390/kernel/setup.c

+0 −9
Original line number Diff line number Diff line
@@ -683,15 +683,6 @@ setup_memory(void) 
#endif

}



static __init unsigned int stfl(void)

{

	asm volatile(

		"	.insn	s,0xb2b10000,0(0)\n" /* stfl */

		"0:\n"

		EX_TABLE(0b,0b));

	return S390_lowcore.stfl_fac_list;

}



static int __init __stfle(unsigned long long *list, int doublewords)

{

	typedef struct { unsigned long long _[doublewords]; } addrtype;

arch/s390/kvm/priv.c

+1 −10
Original line number Diff line number Diff line
@@ -151,18 +151,9 @@ static int handle_chsc(struct kvm_vcpu *vcpu) 
	return 0;

}



static unsigned int kvm_stfl(void)

{

	asm volatile(

		"	.insn	s,0xb2b10000,0(0)\n" /* stfl */

		"0:\n"

		EX_TABLE(0b, 0b));

	return S390_lowcore.stfl_fac_list;

}



static int handle_stfl(struct kvm_vcpu *vcpu)

{

	unsigned int facility_list = kvm_stfl();

	unsigned int facility_list = stfl();

	int rc;



	vcpu->stat.instruction_stfl++;

include/asm-s390/system.h

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/ptrace.h>

#include <asm/setup.h>

#include <asm/processor.h>

#include <asm/lowcore.h>



#ifdef __KERNEL__
@@ -422,6 +423,15 @@ extern void smp_ctl_clear_bit(int cr, int bit); 


#endif /* CONFIG_SMP */



static inline unsigned int stfl(void)

{

	asm volatile(

		"	.insn	s,0xb2b10000,0(0)\n" /* stfl */

		"0:\n"

		EX_TABLE(0b,0b));

	return S390_lowcore.stfl_fac_list;

}



extern void (*_machine_restart)(char *command);

extern void (*_machine_halt)(void);

extern void (*_machine_power_off)(void);