Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27f45130 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] alpha: task_stack_page() 



use task_stack_page() for accesses to stack page of task in alpha-specific
parts of tree

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 37bfbaf9

arch/alpha/kernel/process.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -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) {

arch/alpha/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

include/asm-alpha/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -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)