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

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

s390: get rid of __set_psw_mask() 



With the removal of 31 bit code we can always assume that the epsw
instruction is available. Therefore use the __extract_psw() function
to disable and enable machine checks.

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

arch/s390/include/asm/processor.h

+11 −16
Original line number Diff line number Diff line
@@ -250,6 +250,16 @@ static inline unsigned long __extract_psw(void) 
	return (((unsigned long) reg1) << 32) | ((unsigned long) reg2);

}



static inline void local_mcck_enable(void)

{

	__load_psw_mask(__extract_psw() | PSW_MASK_MCHECK);

}



static inline void local_mcck_disable(void)

{

	__load_psw_mask(__extract_psw() & ~PSW_MASK_MCHECK);

}



/*

 * Rewind PSW instruction address by specified number of bytes.

 */
@@ -317,21 +327,6 @@ static inline void __noreturn disabled_wait(unsigned long code) 
	while (1);

}



/*

 * Use to set psw mask except for the first byte which

 * won't be changed by this function.

 */

static inline void

__set_psw_mask(unsigned long mask)

{

	__load_psw_mask(mask | (arch_local_save_flags() & ~(-1UL >> 8)));

}



#define local_mcck_enable() \

	__set_psw_mask(PSW_KERNEL_BITS | PSW_MASK_DAT | PSW_MASK_MCHECK)

#define local_mcck_disable() \

	__set_psw_mask(PSW_KERNEL_BITS | PSW_MASK_DAT)



/*

 * Basic Machine Check/Program Check Handler.

 */