Skip to content

Commit

Permalink
[PATCH] alpha: task_stack_page()
Browse files Browse the repository at this point in the history
use task_stack_page() for accesses to stack page of task in alpha-specific
parts of tree

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>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Jan 12, 2006
1 parent 37bfbaf commit 27f4513
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions arch/alpha/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
{
extern void ret_from_fork(void);

struct thread_info *childti = p->thread_info;
struct thread_info *childti = task_thread_info(p);
struct pt_regs * childregs;
struct switch_stack * childstack, *stack;
unsigned long stack_offset, settls;
Expand All @@ -285,7 +285,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
if (!(regs->ps & 8))
stack_offset = (PAGE_SIZE-1) & (unsigned long) regs;
childregs = (struct pt_regs *)
(stack_offset + PAGE_SIZE + (long) childti);
(stack_offset + PAGE_SIZE + task_stack_page(p));

*childregs = *regs;
settls = regs->r20;
Expand Down Expand Up @@ -492,7 +492,7 @@ do_sys_execve(char __user *ufilename, char __user * __user *argv,
unsigned long
thread_saved_pc(task_t *t)
{
unsigned long base = (unsigned long)t->thread_info;
unsigned long base = (unsigned long)task_stack_page(t);
unsigned long fp, sp = task_thread_info(t)->pcb.ksp;

if (sp > base && sp+6*8 < base + 16*1024) {
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ get_reg_addr(struct task_struct * task, unsigned long regno)
zero = 0;
addr = &zero;
} else {
addr = (void *)task->thread_info + regoff[regno];
addr = task_stack_page(task) + regoff[regno];
}
return addr;
}
Expand Down
2 changes: 1 addition & 1 deletion include/asm-alpha/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct switch_stack {
extern void show_regs(struct pt_regs *);

#define alpha_task_regs(task) \
((struct pt_regs *) ((long) (task)->thread_info + 2*PAGE_SIZE) - 1)
((struct pt_regs *) (task_stack_page(task) + 2*PAGE_SIZE) - 1)

#define force_successful_syscall_return() (alpha_task_regs(current)->r0 = 0)

Expand Down

0 comments on commit 27f4513

Please sign in to comment.