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

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

s390/compat: make psw32_user_bits a constant value again 



Make psw32_user_bits a constant value again.
This is a leftover of the code which allowed to run the kernel either
in primary or home space which got removed with 9a905662 "s390/uaccess:
always run the kernel in home space".

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

arch/s390/include/asm/compat.h

+3 −1
Original line number Diff line number Diff line
@@ -36,7 +36,9 @@ 
#define PSW32_ASC_SECONDARY	0x00008000UL

#define PSW32_ASC_HOME		0x0000C000UL



extern u32 psw32_user_bits;

#define PSW32_USER_BITS (PSW32_MASK_DAT | PSW32_MASK_IO | PSW32_MASK_EXT | \

			 PSW32_DEFAULT_KEY | PSW32_MASK_BASE | \

			 PSW32_MASK_MCHECK | PSW32_MASK_PSTATE | PSW32_ASC_HOME)



#define COMPAT_USER_HZ		100

#define COMPAT_UTS_MACHINE	"s390\0\0\0\0"

arch/s390/kernel/compat_linux.c

+0 −4
Original line number Diff line number Diff line
@@ -58,10 +58,6 @@ 


#include "compat_linux.h"



u32 psw32_user_bits = PSW32_MASK_DAT | PSW32_MASK_IO | PSW32_MASK_EXT |

		      PSW32_DEFAULT_KEY | PSW32_MASK_BASE | PSW32_MASK_MCHECK |

		      PSW32_MASK_PSTATE | PSW32_ASC_HOME;

 

/* For this source file, we want overflow handling. */



#undef high2lowuid

arch/s390/kernel/compat_signal.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int save_sigregs32(struct pt_regs *regs, _sigregs32 __user *sregs) 


	user_sregs.regs.psw.mask = (__u32)(regs->psw.mask >> 32);

	user_sregs.regs.psw.mask &= PSW32_MASK_USER | PSW32_MASK_RI;

	user_sregs.regs.psw.mask |= psw32_user_bits;

	user_sregs.regs.psw.mask |= PSW32_USER_BITS;

	user_sregs.regs.psw.addr = (__u32) regs->psw.addr |

		(__u32)(regs->psw.mask & PSW_MASK_BA);

	for (i = 0; i < NUM_GPRS; i++)

arch/s390/kernel/ptrace.c

+2 −2
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static u32 __peek_user_compat(struct task_struct *child, addr_t addr) 
			/* Fake a 31 bit psw mask. */

			tmp = (__u32)(regs->psw.mask >> 32);

			tmp &= PSW32_MASK_USER | PSW32_MASK_RI;

			tmp |= psw32_user_bits;

			tmp |= PSW32_USER_BITS;

		} else if (addr == (addr_t) &dummy32->regs.psw.addr) {

			/* Fake a 31 bit psw address. */

			tmp = (__u32) regs->psw.addr |
@@ -664,7 +664,7 @@ static int __poke_user_compat(struct task_struct *child, 


			mask |= is_ri_task(child) ? PSW32_MASK_RI : 0;

			/* Build a 64 bit psw mask from 31 bit mask. */

			if ((tmp & ~mask) != psw32_user_bits)

			if ((tmp & ~mask) != PSW32_USER_BITS)

				/* Invalid psw mask. */

				return -EINVAL;

			regs->psw.mask = (regs->psw.mask & ~PSW_MASK_USER) |