diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-31 22:20:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-31 22:20:56 -0700 |
| commit | 58c1f9950ffc6acbb907051b0a4e56aaf4baa9ce (patch) | |
| tree | a24d739eead7f29c345c6cd72f32a8309ea473da /arch/sparc/include/asm/head_64.h | |
| parent | 367d3fd50566a313946fa9c5b2116a81bf3807e4 (diff) | |
| parent | 7cafc0b8bf130f038b0ec2dcdd6a9de6dc59b65a (diff) | |
| download | linux-stericsson-58c1f9950ffc6acbb907051b0a4e56aaf4baa9ce.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"sparc64 mmu context allocation and trap return bug fixes"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Fix return from trap window fill crashes.
sparc: Harden signal return frame checks.
sparc64: Take ctx_alloc_lock properly in hugetlb_setup().
Diffstat (limited to 'arch/sparc/include/asm/head_64.h')
| -rw-r--r-- | arch/sparc/include/asm/head_64.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/head_64.h b/arch/sparc/include/asm/head_64.h index 10e9dabc4c41..f0700cfeedd7 100644 --- a/arch/sparc/include/asm/head_64.h +++ b/arch/sparc/include/asm/head_64.h @@ -15,6 +15,10 @@ #define PTREGS_OFF (STACK_BIAS + STACKFRAME_SZ) +#define RTRAP_PSTATE (PSTATE_TSO|PSTATE_PEF|PSTATE_PRIV|PSTATE_IE) +#define RTRAP_PSTATE_IRQOFF (PSTATE_TSO|PSTATE_PEF|PSTATE_PRIV) +#define RTRAP_PSTATE_AG_IRQOFF (PSTATE_TSO|PSTATE_PEF|PSTATE_PRIV|PSTATE_AG) + #define __CHEETAH_ID 0x003e0014 #define __JALAPENO_ID 0x003e0016 #define __SERRANO_ID 0x003e0022 |