diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 04:05:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:08:53 -0500 |
commit | d562ef6a23feb72f32ebd23fb32fe7d2c35a85cd (patch) | |
tree | 3ee5db91cee3b52c6ba1a07a8f487bfe3df0d095 /arch | |
parent | 308a792f7c563a7af6e325274c63812f98988d6f (diff) |
[PATCH] sparc: task_thread_info()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/kernel/process.c | 4 | ||||
-rw-r--r-- | arch/sparc/kernel/ptrace.c | 4 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4d_smp.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4m_smp.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/traps.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c index ea8647411462..7eebb08a953a 100644 --- a/arch/sparc/kernel/process.c +++ b/arch/sparc/kernel/process.c | |||
@@ -337,7 +337,7 @@ EXPORT_SYMBOL(dump_stack); | |||
337 | */ | 337 | */ |
338 | unsigned long thread_saved_pc(struct task_struct *tsk) | 338 | unsigned long thread_saved_pc(struct task_struct *tsk) |
339 | { | 339 | { |
340 | return tsk->thread_info->kpc; | 340 | return task_thread_info(tsk)->kpc; |
341 | } | 341 | } |
342 | 342 | ||
343 | /* | 343 | /* |
@@ -724,7 +724,7 @@ unsigned long get_wchan(struct task_struct *task) | |||
724 | task->state == TASK_RUNNING) | 724 | task->state == TASK_RUNNING) |
725 | goto out; | 725 | goto out; |
726 | 726 | ||
727 | fp = task->thread_info->ksp + bias; | 727 | fp = task_thread_info(task)->ksp + bias; |
728 | do { | 728 | do { |
729 | /* Bogus frame pointer? */ | 729 | /* Bogus frame pointer? */ |
730 | if (fp < (task_base + sizeof(struct thread_info)) || | 730 | if (fp < (task_base + sizeof(struct thread_info)) || |
diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c index fc470c0e9dc6..1baf13ed5c3a 100644 --- a/arch/sparc/kernel/ptrace.c +++ b/arch/sparc/kernel/ptrace.c | |||
@@ -75,7 +75,7 @@ static inline void read_sunos_user(struct pt_regs *regs, unsigned long offset, | |||
75 | struct task_struct *tsk, long __user *addr) | 75 | struct task_struct *tsk, long __user *addr) |
76 | { | 76 | { |
77 | struct pt_regs *cregs = tsk->thread.kregs; | 77 | struct pt_regs *cregs = tsk->thread.kregs; |
78 | struct thread_info *t = tsk->thread_info; | 78 | struct thread_info *t = task_thread_info(tsk); |
79 | int v; | 79 | int v; |
80 | 80 | ||
81 | if(offset >= 1024) | 81 | if(offset >= 1024) |
@@ -170,7 +170,7 @@ static inline void write_sunos_user(struct pt_regs *regs, unsigned long offset, | |||
170 | struct task_struct *tsk) | 170 | struct task_struct *tsk) |
171 | { | 171 | { |
172 | struct pt_regs *cregs = tsk->thread.kregs; | 172 | struct pt_regs *cregs = tsk->thread.kregs; |
173 | struct thread_info *t = tsk->thread_info; | 173 | struct thread_info *t = task_thread_info(tsk); |
174 | unsigned long value = regs->u_regs[UREG_I3]; | 174 | unsigned long value = regs->u_regs[UREG_I3]; |
175 | 175 | ||
176 | if(offset >= 1024) | 176 | if(offset >= 1024) |
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c index cc1fc898495c..40d426cce824 100644 --- a/arch/sparc/kernel/sun4d_smp.c +++ b/arch/sparc/kernel/sun4d_smp.c | |||
@@ -200,7 +200,7 @@ void __init smp4d_boot_cpus(void) | |||
200 | /* Cook up an idler for this guy. */ | 200 | /* Cook up an idler for this guy. */ |
201 | p = fork_idle(i); | 201 | p = fork_idle(i); |
202 | cpucount++; | 202 | cpucount++; |
203 | current_set[i] = p->thread_info; | 203 | current_set[i] = task_thread_info(p); |
204 | for (no = 0; !cpu_find_by_instance(no, NULL, &mid) | 204 | for (no = 0; !cpu_find_by_instance(no, NULL, &mid) |
205 | && mid != i; no++) ; | 205 | && mid != i; no++) ; |
206 | 206 | ||
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index f113422a3727..a21f27d10e55 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c | |||
@@ -173,7 +173,7 @@ void __init smp4m_boot_cpus(void) | |||
173 | /* Cook up an idler for this guy. */ | 173 | /* Cook up an idler for this guy. */ |
174 | p = fork_idle(i); | 174 | p = fork_idle(i); |
175 | cpucount++; | 175 | cpucount++; |
176 | current_set[i] = p->thread_info; | 176 | current_set[i] = task_thread_info(p); |
177 | /* See trampoline.S for details... */ | 177 | /* See trampoline.S for details... */ |
178 | entry += ((i-1) * 3); | 178 | entry += ((i-1) * 3); |
179 | 179 | ||
diff --git a/arch/sparc/kernel/traps.c b/arch/sparc/kernel/traps.c index 3f451ae66482..41d45c298fb2 100644 --- a/arch/sparc/kernel/traps.c +++ b/arch/sparc/kernel/traps.c | |||
@@ -291,7 +291,7 @@ void do_fpe_trap(struct pt_regs *regs, unsigned long pc, unsigned long npc, | |||
291 | #ifndef CONFIG_SMP | 291 | #ifndef CONFIG_SMP |
292 | if(!fpt) { | 292 | if(!fpt) { |
293 | #else | 293 | #else |
294 | if(!(fpt->thread_info->flags & _TIF_USEDFPU)) { | 294 | if(!(task_thread_info(fpt)->flags & _TIF_USEDFPU)) { |
295 | #endif | 295 | #endif |
296 | fpsave(&fake_regs[0], &fake_fsr, &fake_queue[0], &fake_depth); | 296 | fpsave(&fake_regs[0], &fake_fsr, &fake_queue[0], &fake_depth); |
297 | regs->psr &= ~PSR_EF; | 297 | regs->psr &= ~PSR_EF; |
@@ -334,7 +334,7 @@ void do_fpe_trap(struct pt_regs *regs, unsigned long pc, unsigned long npc, | |||
334 | /* nope, better SIGFPE the offending process... */ | 334 | /* nope, better SIGFPE the offending process... */ |
335 | 335 | ||
336 | #ifdef CONFIG_SMP | 336 | #ifdef CONFIG_SMP |
337 | fpt->thread_info->flags &= ~_TIF_USEDFPU; | 337 | task_thread_info(fpt)->flags &= ~_TIF_USEDFPU; |
338 | #endif | 338 | #endif |
339 | if(psr & PSR_PS) { | 339 | if(psr & PSR_PS) { |
340 | /* The first fsr store/load we tried trapped, | 340 | /* The first fsr store/load we tried trapped, |