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

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

[S390] Move stfle to header file. 



stfle will be needed by the ap_bus module to figure out wether the AP
queue adapter interruption facility is installed.

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

arch/s390/include/asm/system.h

+18 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define __ASM_SYSTEM_H



#include <linux/kernel.h>

#include <linux/errno.h>

#include <asm/types.h>

#include <asm/ptrace.h>

#include <asm/setup.h>
@@ -413,8 +414,6 @@ __set_psw_mask(unsigned long mask) 
#define local_mcck_enable()  __set_psw_mask(psw_kernel_bits)

#define local_mcck_disable() __set_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK)



int stfle(unsigned long long *list, int doublewords);



#ifdef CONFIG_SMP



extern void smp_ctl_set_bit(int cr, int bit);
@@ -438,6 +437,23 @@ static inline unsigned int stfl(void) 
	return S390_lowcore.stfl_fac_list;

}



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

{

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

	register unsigned long __nr asm("0") = doublewords - 1;



	asm volatile(".insn s,0xb2b00000,%0" /* stfle */

		     : "=m" (*(addrtype *) list), "+d" (__nr) : : "cc");

	return __nr + 1;

}



static inline int stfle(unsigned long long *list, int doublewords)

{

	if (!(stfl() & (1UL << 24)))

		return -EOPNOTSUPP;

	return __stfle(list, doublewords);

}



static inline unsigned short stap(void)

{

	unsigned short cpu_address;

arch/s390/kernel/setup.c

+0 −17
Original line number Diff line number Diff line
@@ -651,23 +651,6 @@ setup_memory(void) 
#endif

}



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

{

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

	register unsigned long __nr asm("0") = doublewords - 1;



	asm volatile(".insn s,0xb2b00000,%0" /* stfle */

		     : "=m" (*(addrtype *) list), "+d" (__nr) : : "cc");

	return __nr + 1;

}



int __init stfle(unsigned long long *list, int doublewords)

{

	if (!(stfl() & (1UL << 24)))

		return -EOPNOTSUPP;

	return __stfle(list, doublewords);

}



/*

 * Setup hardware capabilities.

 */