Commit 63764028 authored by Heiko Carstens's avatar Heiko Carstens Committed by Alexander Gordeev
Browse files

s390/ptrace: remove PSW_DEFAULT_KEY from uapi 



Move PSW_DEFAULT_KEY from uapi/asm/ptrace.h to asm/ptrace.h. This is
possible, since it depends on PAGE_DEFAULT_ACC which is not part of
uapi. Or in other words: this define cannot be used without error.

Therefore remove it from uapi.

Acked-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent d15e4314

arch/s390/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#define PAGE_SHIFT	_PAGE_SHIFT

#define PAGE_SIZE	_PAGE_SIZE

#define PAGE_MASK	_PAGE_MASK

#define PAGE_DEFAULT_ACC	0

#define PAGE_DEFAULT_ACC	_AC(0, UL)

/* storage-protection override */

#define PAGE_SPO_ACC		9

#define PAGE_DEFAULT_KEY	(PAGE_DEFAULT_ACC << 4)

arch/s390/include/asm/ptrace.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#define _PIF_GUEST_FAULT		BIT(PIF_GUEST_FAULT)

#define _PIF_FTRACE_FULL_REGS		BIT(PIF_FTRACE_FULL_REGS)



#define PSW_DEFAULT_KEY			((PAGE_DEFAULT_ACC) << 52)



#ifndef __ASSEMBLY__



#define PSW_KERNEL_BITS	(PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_ASC_HOME | \

arch/s390/include/uapi/asm/ptrace.h

+0 −4
Original line number Diff line number Diff line
@@ -237,8 +237,6 @@ typedef struct { 
#define PSW_ADDR_AMODE		0x80000000UL

#define PSW_ADDR_INSN		0x7FFFFFFFUL



#define PSW_DEFAULT_KEY		(((unsigned long) PAGE_DEFAULT_ACC) << 20)



#define PSW_ASC_PRIMARY		0x00000000UL

#define PSW_ASC_ACCREG		0x00004000UL

#define PSW_ASC_SECONDARY	0x00008000UL
@@ -267,8 +265,6 @@ typedef struct { 
#define PSW_ADDR_AMODE		0x0000000000000000UL

#define PSW_ADDR_INSN		0xFFFFFFFFFFFFFFFFUL



#define PSW_DEFAULT_KEY		(((unsigned long) PAGE_DEFAULT_ACC) << 52)



#define PSW_ASC_PRIMARY		0x0000000000000000UL

#define PSW_ASC_ACCREG		0x0000400000000000UL

#define PSW_ASC_SECONDARY	0x0000800000000000UL