diff options
author | Guenter Roeck <linux@roeck-us.net> | 2015-04-11 22:58:25 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2015-04-12 15:03:31 -0400 |
commit | 720d70716d137c0cb83b9a5279c384286c02a1c0 (patch) | |
tree | 0941253e0494b153eb98a212255ca86ff9deea64 /arch | |
parent | 9058f3b326dbe8cd2ebea7f3cfe367b0d101039b (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/include/asm/thread_info_32.h | 16 |
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 a7a18142099e..229475f0d7ce 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 { | |||
34 | int softirq_count; | 34 | int softirq_count; |
35 | int hardirq_count; | 35 | int hardirq_count; |
36 | 36 | ||
37 | u32 __unused; | ||
38 | |||
37 | /* Context switch saved kernel state. */ | 39 | /* Context switch saved kernel state. */ |
38 | unsigned long ksp; /* ... ksp __attribute__ ((aligned (8))); */ | 40 | unsigned long ksp; /* ... ksp __attribute__ ((aligned (8))); */ |
39 | unsigned long kpc; | 41 | unsigned long kpc; |
@@ -88,13 +90,13 @@ register struct thread_info *current_thread_info_reg asm("g6"); | |||
88 | #define TI_PREEMPT 0x10 /* preempt_count */ | 90 | #define TI_PREEMPT 0x10 /* preempt_count */ |
89 | #define TI_SOFTIRQ 0x14 /* softirq_count */ | 91 | #define TI_SOFTIRQ 0x14 /* softirq_count */ |
90 | #define TI_HARDIRQ 0x18 /* hardirq_count */ | 92 | #define TI_HARDIRQ 0x18 /* hardirq_count */ |
91 | #define TI_KSP 0x1c /* ksp */ | 93 | #define TI_KSP 0x20 /* ksp */ |
92 | #define TI_KPC 0x20 /* kpc (ldd'ed with kpc) */ | 94 | #define TI_KPC 0x24 /* kpc (ldd'ed with kpc) */ |
93 | #define TI_KPSR 0x24 /* kpsr */ | 95 | #define TI_KPSR 0x28 /* kpsr */ |
94 | #define TI_KWIM 0x28 /* kwim (ldd'ed with kpsr) */ | 96 | #define TI_KWIM 0x2c /* kwim (ldd'ed with kpsr) */ |
95 | #define TI_REG_WINDOW 0x2c | 97 | #define TI_REG_WINDOW 0x30 |
96 | #define TI_RWIN_SPTRS 0x22c | 98 | #define TI_RWIN_SPTRS 0x230 |
97 | #define TI_W_SAVED 0x24c | 99 | #define TI_W_SAVED 0x250 |
98 | 100 | ||
99 | /* | 101 | /* |
100 | * thread information flag bit numbers | 102 | * thread information flag bit numbers |