diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-15 16:53:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-15 16:53:55 -0400 |
commit | fa2e5c073a355465a2a8c9a2fbecf404f9857c3a (patch) | |
tree | 771be75e5436031ad53649634dffa67f6667b083 /arch/metag | |
parent | e44740c1a94b5d39b093045920f543a7bc135584 (diff) | |
parent | 97b2f0dc331474fb80ba4f4e4aee1d8e9ffbf7ce (diff) |
Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc
Pull exec domain removal from Richard Weinberger:
"This series removes execution domain support from Linux.
The idea behind exec domains was to support different ABIs. The
feature was never complete nor stable. Let's rip it out and make the
kernel signal handling code less complicated"
* 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc: (27 commits)
arm64: Removed unused variable
sparc: Fix execution domain removal
Remove rest of exec domains.
arch: Remove exec_domain from remaining archs
arc: Remove signal translation and exec_domain
xtensa: Remove signal translation and exec_domain
xtensa: Autogenerate offsets in struct thread_info
x86: Remove signal translation and exec_domain
unicore32: Remove signal translation and exec_domain
um: Remove signal translation and exec_domain
tile: Remove signal translation and exec_domain
sparc: Remove signal translation and exec_domain
sh: Remove signal translation and exec_domain
s390: Remove signal translation and exec_domain
mn10300: Remove signal translation and exec_domain
microblaze: Remove signal translation and exec_domain
m68k: Remove signal translation and exec_domain
m32r: Remove signal translation and exec_domain
m32r: Autogenerate offsets in struct thread_info
frv: Remove signal translation and exec_domain
...
Diffstat (limited to 'arch/metag')
-rw-r--r-- | arch/metag/include/asm/thread_info.h | 2 | ||||
-rw-r--r-- | arch/metag/kernel/irq.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/metag/include/asm/thread_info.h b/arch/metag/include/asm/thread_info.h index afb3ca4776d1..32677cc278aa 100644 --- a/arch/metag/include/asm/thread_info.h +++ b/arch/metag/include/asm/thread_info.h | |||
@@ -28,7 +28,6 @@ | |||
28 | /* This must be 8 byte aligned so we can ensure stack alignment. */ | 28 | /* This must be 8 byte aligned so we can ensure stack alignment. */ |
29 | struct thread_info { | 29 | struct thread_info { |
30 | struct task_struct *task; /* main task structure */ | 30 | struct task_struct *task; /* main task structure */ |
31 | struct exec_domain *exec_domain; /* execution domain */ | ||
32 | unsigned long flags; /* low level flags */ | 31 | unsigned long flags; /* low level flags */ |
33 | unsigned long status; /* thread-synchronous flags */ | 32 | unsigned long status; /* thread-synchronous flags */ |
34 | u32 cpu; /* current CPU */ | 33 | u32 cpu; /* current CPU */ |
@@ -68,7 +67,6 @@ struct thread_info { | |||
68 | #define INIT_THREAD_INFO(tsk) \ | 67 | #define INIT_THREAD_INFO(tsk) \ |
69 | { \ | 68 | { \ |
70 | .task = &tsk, \ | 69 | .task = &tsk, \ |
71 | .exec_domain = &default_exec_domain, \ | ||
72 | .flags = 0, \ | 70 | .flags = 0, \ |
73 | .cpu = 0, \ | 71 | .cpu = 0, \ |
74 | .preempt_count = INIT_PREEMPT_COUNT, \ | 72 | .preempt_count = INIT_PREEMPT_COUNT, \ |
diff --git a/arch/metag/kernel/irq.c b/arch/metag/kernel/irq.c index 5385dd1216b7..4f8f1f87ef11 100644 --- a/arch/metag/kernel/irq.c +++ b/arch/metag/kernel/irq.c | |||
@@ -132,7 +132,6 @@ void irq_ctx_init(int cpu) | |||
132 | 132 | ||
133 | irqctx = (union irq_ctx *) &hardirq_stack[cpu * THREAD_SIZE]; | 133 | irqctx = (union irq_ctx *) &hardirq_stack[cpu * THREAD_SIZE]; |
134 | irqctx->tinfo.task = NULL; | 134 | irqctx->tinfo.task = NULL; |
135 | irqctx->tinfo.exec_domain = NULL; | ||
136 | irqctx->tinfo.cpu = cpu; | 135 | irqctx->tinfo.cpu = cpu; |
137 | irqctx->tinfo.preempt_count = HARDIRQ_OFFSET; | 136 | irqctx->tinfo.preempt_count = HARDIRQ_OFFSET; |
138 | irqctx->tinfo.addr_limit = MAKE_MM_SEG(0); | 137 | irqctx->tinfo.addr_limit = MAKE_MM_SEG(0); |
@@ -141,7 +140,6 @@ void irq_ctx_init(int cpu) | |||
141 | 140 | ||
142 | irqctx = (union irq_ctx *) &softirq_stack[cpu * THREAD_SIZE]; | 141 | irqctx = (union irq_ctx *) &softirq_stack[cpu * THREAD_SIZE]; |
143 | irqctx->tinfo.task = NULL; | 142 | irqctx->tinfo.task = NULL; |
144 | irqctx->tinfo.exec_domain = NULL; | ||
145 | irqctx->tinfo.cpu = cpu; | 143 | irqctx->tinfo.cpu = cpu; |
146 | irqctx->tinfo.preempt_count = 0; | 144 | irqctx->tinfo.preempt_count = 0; |
147 | irqctx->tinfo.addr_limit = MAKE_MM_SEG(0); | 145 | irqctx->tinfo.addr_limit = MAKE_MM_SEG(0); |