diff options
author | Richard Weinberger <richard@nod.at> | 2014-07-13 11:39:47 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2015-04-12 15:03:21 -0400 |
commit | 14464772c95d351e802b7f07c1860d9e5bf2cafc (patch) | |
tree | 4f65f5cf89e1dd3f1fc7408d2e0beaffc6325355 /arch/sparc | |
parent | daea906dd31843edc062faba82cd43c8b720305d (diff) |
sparc: Remove signal translation and exec_domain
As execution domain support is gone we can remove
signal translation from the signal code and remove
exec_domain from thread_info.
Signed-off-by: Richard Weinberger <richard@nod.at>
Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/include/asm/thread_info_32.h | 27 | ||||
-rw-r--r-- | arch/sparc/include/asm/thread_info_64.h | 26 | ||||
-rw-r--r-- | arch/sparc/kernel/traps_32.c | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/traps_64.c | 2 |
4 files changed, 23 insertions, 33 deletions
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h index fd7bd0a440ca..a7a18142099e 100644 --- a/arch/sparc/include/asm/thread_info_32.h +++ b/arch/sparc/include/asm/thread_info_32.h | |||
@@ -27,7 +27,6 @@ | |||
27 | struct thread_info { | 27 | struct thread_info { |
28 | unsigned long uwinmask; | 28 | unsigned long uwinmask; |
29 | struct task_struct *task; /* main task structure */ | 29 | struct task_struct *task; /* main task structure */ |
30 | struct exec_domain *exec_domain; /* execution domain */ | ||
31 | unsigned long flags; /* low level flags */ | 30 | unsigned long flags; /* low level flags */ |
32 | int cpu; /* cpu we're on */ | 31 | int cpu; /* cpu we're on */ |
33 | int preempt_count; /* 0 => preemptable, | 32 | int preempt_count; /* 0 => preemptable, |
@@ -56,7 +55,6 @@ struct thread_info { | |||
56 | { \ | 55 | { \ |
57 | .uwinmask = 0, \ | 56 | .uwinmask = 0, \ |
58 | .task = &tsk, \ | 57 | .task = &tsk, \ |
59 | .exec_domain = &default_exec_domain, \ | ||
60 | .flags = 0, \ | 58 | .flags = 0, \ |
61 | .cpu = 0, \ | 59 | .cpu = 0, \ |
62 | .preempt_count = INIT_PREEMPT_COUNT, \ | 60 | .preempt_count = INIT_PREEMPT_COUNT, \ |
@@ -85,19 +83,18 @@ register struct thread_info *current_thread_info_reg asm("g6"); | |||
85 | */ | 83 | */ |
86 | #define TI_UWINMASK 0x00 /* uwinmask */ | 84 | #define TI_UWINMASK 0x00 /* uwinmask */ |
87 | #define TI_TASK 0x04 | 85 | #define TI_TASK 0x04 |
88 | #define TI_EXECDOMAIN 0x08 /* exec_domain */ | 86 | #define TI_FLAGS 0x08 |
89 | #define TI_FLAGS 0x0c | 87 | #define TI_CPU 0x0c |
90 | #define TI_CPU 0x10 | 88 | #define TI_PREEMPT 0x10 /* preempt_count */ |
91 | #define TI_PREEMPT 0x14 /* preempt_count */ | 89 | #define TI_SOFTIRQ 0x14 /* softirq_count */ |
92 | #define TI_SOFTIRQ 0x18 /* softirq_count */ | 90 | #define TI_HARDIRQ 0x18 /* hardirq_count */ |
93 | #define TI_HARDIRQ 0x1c /* hardirq_count */ | 91 | #define TI_KSP 0x1c /* ksp */ |
94 | #define TI_KSP 0x20 /* ksp */ | 92 | #define TI_KPC 0x20 /* kpc (ldd'ed with kpc) */ |
95 | #define TI_KPC 0x24 /* kpc (ldd'ed with kpc) */ | 93 | #define TI_KPSR 0x24 /* kpsr */ |
96 | #define TI_KPSR 0x28 /* kpsr */ | 94 | #define TI_KWIM 0x28 /* kwim (ldd'ed with kpsr) */ |
97 | #define TI_KWIM 0x2c /* kwim (ldd'ed with kpsr) */ | 95 | #define TI_REG_WINDOW 0x2c |
98 | #define TI_REG_WINDOW 0x30 | 96 | #define TI_RWIN_SPTRS 0x22c |
99 | #define TI_RWIN_SPTRS 0x230 | 97 | #define TI_W_SAVED 0x24c |
100 | #define TI_W_SAVED 0x250 | ||
101 | 98 | ||
102 | /* | 99 | /* |
103 | * thread information flag bit numbers | 100 | * thread information flag bit numbers |
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h index ff455164732a..bde59825d06c 100644 --- a/arch/sparc/include/asm/thread_info_64.h +++ b/arch/sparc/include/asm/thread_info_64.h | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <asm/types.h> | 31 | #include <asm/types.h> |
32 | 32 | ||
33 | struct task_struct; | 33 | struct task_struct; |
34 | struct exec_domain; | ||
35 | 34 | ||
36 | struct thread_info { | 35 | struct thread_info { |
37 | /* D$ line 1 */ | 36 | /* D$ line 1 */ |
@@ -44,7 +43,6 @@ struct thread_info { | |||
44 | /* D$ line 2 */ | 43 | /* D$ line 2 */ |
45 | unsigned long fault_address; | 44 | unsigned long fault_address; |
46 | struct pt_regs *kregs; | 45 | struct pt_regs *kregs; |
47 | struct exec_domain *exec_domain; | ||
48 | int preempt_count; /* 0 => preemptable, <0 => BUG */ | 46 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
49 | __u8 new_child; | 47 | __u8 new_child; |
50 | __u8 current_ds; | 48 | __u8 current_ds; |
@@ -80,18 +78,17 @@ struct thread_info { | |||
80 | #define TI_KSP 0x00000018 | 78 | #define TI_KSP 0x00000018 |
81 | #define TI_FAULT_ADDR 0x00000020 | 79 | #define TI_FAULT_ADDR 0x00000020 |
82 | #define TI_KREGS 0x00000028 | 80 | #define TI_KREGS 0x00000028 |
83 | #define TI_EXEC_DOMAIN 0x00000030 | 81 | #define TI_PRE_COUNT 0x00000030 |
84 | #define TI_PRE_COUNT 0x00000038 | 82 | #define TI_NEW_CHILD 0x00000034 |
85 | #define TI_NEW_CHILD 0x0000003c | 83 | #define TI_CURRENT_DS 0x00000035 |
86 | #define TI_CURRENT_DS 0x0000003d | 84 | #define TI_CPU 0x00000036 |
87 | #define TI_CPU 0x0000003e | 85 | #define TI_UTRAPS 0x00000038 |
88 | #define TI_UTRAPS 0x00000040 | 86 | #define TI_REG_WINDOW 0x00000040 |
89 | #define TI_REG_WINDOW 0x00000048 | 87 | #define TI_RWIN_SPTRS 0x000003c0 |
90 | #define TI_RWIN_SPTRS 0x000003c8 | 88 | #define TI_GSR 0x000003f8 |
91 | #define TI_GSR 0x00000400 | 89 | #define TI_XFSR 0x00000430 |
92 | #define TI_XFSR 0x00000438 | 90 | #define TI_KUNA_REGS 0x00000468 |
93 | #define TI_KUNA_REGS 0x00000470 | 91 | #define TI_KUNA_INSN 0x00000470 |
94 | #define TI_KUNA_INSN 0x00000478 | ||
95 | #define TI_FPREGS 0x00000480 | 92 | #define TI_FPREGS 0x00000480 |
96 | 93 | ||
97 | /* We embed this in the uppermost byte of thread_info->flags */ | 94 | /* We embed this in the uppermost byte of thread_info->flags */ |
@@ -119,7 +116,6 @@ struct thread_info { | |||
119 | { \ | 116 | { \ |
120 | .task = &tsk, \ | 117 | .task = &tsk, \ |
121 | .current_ds = ASI_P, \ | 118 | .current_ds = ASI_P, \ |
122 | .exec_domain = &default_exec_domain, \ | ||
123 | .preempt_count = INIT_PREEMPT_COUNT, \ | 119 | .preempt_count = INIT_PREEMPT_COUNT, \ |
124 | } | 120 | } |
125 | 121 | ||
diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c index 6fd386c5232a..4f21df7d4f13 100644 --- a/arch/sparc/kernel/traps_32.c +++ b/arch/sparc/kernel/traps_32.c | |||
@@ -433,7 +433,6 @@ void trap_init(void) | |||
433 | /* Force linker to barf if mismatched */ | 433 | /* Force linker to barf if mismatched */ |
434 | if (TI_UWINMASK != offsetof(struct thread_info, uwinmask) || | 434 | if (TI_UWINMASK != offsetof(struct thread_info, uwinmask) || |
435 | TI_TASK != offsetof(struct thread_info, task) || | 435 | TI_TASK != offsetof(struct thread_info, task) || |
436 | TI_EXECDOMAIN != offsetof(struct thread_info, exec_domain) || | ||
437 | TI_FLAGS != offsetof(struct thread_info, flags) || | 436 | TI_FLAGS != offsetof(struct thread_info, flags) || |
438 | TI_CPU != offsetof(struct thread_info, cpu) || | 437 | TI_CPU != offsetof(struct thread_info, cpu) || |
439 | TI_PREEMPT != offsetof(struct thread_info, preempt_count) || | 438 | TI_PREEMPT != offsetof(struct thread_info, preempt_count) || |
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c index 0e699745d643..d21cd625c0de 100644 --- a/arch/sparc/kernel/traps_64.c +++ b/arch/sparc/kernel/traps_64.c | |||
@@ -2691,8 +2691,6 @@ void __init trap_init(void) | |||
2691 | fault_address) || | 2691 | fault_address) || |
2692 | TI_KREGS != offsetof(struct thread_info, kregs) || | 2692 | TI_KREGS != offsetof(struct thread_info, kregs) || |
2693 | TI_UTRAPS != offsetof(struct thread_info, utraps) || | 2693 | TI_UTRAPS != offsetof(struct thread_info, utraps) || |
2694 | TI_EXEC_DOMAIN != offsetof(struct thread_info, | ||
2695 | exec_domain) || | ||
2696 | TI_REG_WINDOW != offsetof(struct thread_info, | 2694 | TI_REG_WINDOW != offsetof(struct thread_info, |
2697 | reg_window) || | 2695 | reg_window) || |
2698 | TI_RWIN_SPTRS != offsetof(struct thread_info, | 2696 | TI_RWIN_SPTRS != offsetof(struct thread_info, |