summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2015-04-12 02:58:25 (GMT)
committerRichard Weinberger <richard@nod.at>2015-04-12 19:03:31 (GMT)
commit720d70716d137c0cb83b9a5279c384286c02a1c0 (patch)
tree0941253e0494b153eb98a212255ca86ff9deea64
parent9058f3b326dbe8cd2ebea7f3cfe367b0d101039b (diff)
downloadlinux-720d70716d137c0cb83b9a5279c384286c02a1c0.tar.xz
sparc: Fix execution domain removal
ksp must be 8-byte aligned. Cc: Richard Weinberger <richard@nod.at> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Richard Weinberger <richard@nod.at>
-rw-r--r--arch/sparc/include/asm/thread_info_32.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
index a7a1814..229475f 100644
--- a/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@ -34,6 +34,8 @@ struct thread_info {
int softirq_count;
int hardirq_count;
+ u32 __unused;
+
/* Context switch saved kernel state. */
unsigned long ksp; /* ... ksp __attribute__ ((aligned (8))); */
unsigned long kpc;
@@ -88,13 +90,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
#define TI_PREEMPT 0x10 /* preempt_count */
#define TI_SOFTIRQ 0x14 /* softirq_count */
#define TI_HARDIRQ 0x18 /* hardirq_count */
-#define TI_KSP 0x1c /* ksp */
-#define TI_KPC 0x20 /* kpc (ldd'ed with kpc) */
-#define TI_KPSR 0x24 /* kpsr */
-#define TI_KWIM 0x28 /* kwim (ldd'ed with kpsr) */
-#define TI_REG_WINDOW 0x2c
-#define TI_RWIN_SPTRS 0x22c
-#define TI_W_SAVED 0x24c
+#define TI_KSP 0x20 /* ksp */
+#define TI_KPC 0x24 /* kpc (ldd'ed with kpc) */
+#define TI_KPSR 0x28 /* kpsr */
+#define TI_KWIM 0x2c /* kwim (ldd'ed with kpsr) */
+#define TI_REG_WINDOW 0x30
+#define TI_RWIN_SPTRS 0x230
+#define TI_W_SAVED 0x250
/*
* thread information flag bit numbers