mirror of
https://github.com/joel16/android_kernel_sony_msm8994_rework.git
synced 2024-11-24 12:29:53 +00:00
[PATCH] alpha: task_pt_regs()
) From: Al Viro <viro@ftp.linux.org.uk> rename alpha_task_regs() to task_pt_regs(), switch open-coded instances to use of the helper. 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>
This commit is contained in:
parent
27f451304a
commit
e52f4ca2a7
@ -428,30 +428,15 @@ dump_elf_thread(elf_greg_t *dest, struct pt_regs *pt, struct thread_info *ti)
|
||||
int
|
||||
dump_elf_task(elf_greg_t *dest, struct task_struct *task)
|
||||
{
|
||||
struct thread_info *ti;
|
||||
struct pt_regs *pt;
|
||||
|
||||
ti = task->thread_info;
|
||||
pt = (struct pt_regs *)((unsigned long)ti + 2*PAGE_SIZE) - 1;
|
||||
|
||||
dump_elf_thread(dest, pt, ti);
|
||||
|
||||
dump_elf_thread(dest, task_pt_regs(task), task_thread_info(task));
|
||||
return 1;
|
||||
}
|
||||
|
||||
int
|
||||
dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task)
|
||||
{
|
||||
struct thread_info *ti;
|
||||
struct pt_regs *pt;
|
||||
struct switch_stack *sw;
|
||||
|
||||
ti = task->thread_info;
|
||||
pt = (struct pt_regs *)((unsigned long)ti + 2*PAGE_SIZE) - 1;
|
||||
sw = (struct switch_stack *)pt - 1;
|
||||
|
||||
struct switch_stack *sw = (struct switch_stack *)task_pt_regs(task) - 1;
|
||||
memcpy(dest, sw->fp, 32 * 8);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -72,6 +72,13 @@ enum {
|
||||
REG_R0 = 0, REG_F0 = 32, REG_FPCR = 63, REG_PC = 64
|
||||
};
|
||||
|
||||
#define PT_REG(reg) \
|
||||
(PAGE_SIZE*2 - sizeof(struct pt_regs) + offsetof(struct pt_regs, reg))
|
||||
|
||||
#define SW_REG(reg) \
|
||||
(PAGE_SIZE*2 - sizeof(struct pt_regs) - sizeof(struct switch_stack) \
|
||||
+ offsetof(struct switch_stack, reg))
|
||||
|
||||
static int regoff[] = {
|
||||
PT_REG( r0), PT_REG( r1), PT_REG( r2), PT_REG( r3),
|
||||
PT_REG( r4), PT_REG( r5), PT_REG( r6), PT_REG( r7),
|
||||
|
@ -52,16 +52,7 @@ extern long kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
|
||||
|
||||
unsigned long get_wchan(struct task_struct *p);
|
||||
|
||||
/* See arch/alpha/kernel/ptrace.c for details. */
|
||||
#define PT_REG(reg) \
|
||||
(PAGE_SIZE*2 - sizeof(struct pt_regs) + offsetof(struct pt_regs, reg))
|
||||
|
||||
#define SW_REG(reg) \
|
||||
(PAGE_SIZE*2 - sizeof(struct pt_regs) - sizeof(struct switch_stack) \
|
||||
+ offsetof(struct switch_stack, reg))
|
||||
|
||||
#define KSTK_EIP(tsk) \
|
||||
(*(unsigned long *)(PT_REG(pc) + (unsigned long) ((tsk)->thread_info)))
|
||||
#define KSTK_EIP(tsk) (task_pt_regs(tsk)->pc)
|
||||
|
||||
#define KSTK_ESP(tsk) \
|
||||
((tsk) == current ? rdusp() : task_thread_info(tsk)->pcb.usp)
|
||||
|
@ -75,10 +75,10 @@ struct switch_stack {
|
||||
#define profile_pc(regs) instruction_pointer(regs)
|
||||
extern void show_regs(struct pt_regs *);
|
||||
|
||||
#define alpha_task_regs(task) \
|
||||
#define task_pt_regs(task) \
|
||||
((struct pt_regs *) (task_stack_page(task) + 2*PAGE_SIZE) - 1)
|
||||
|
||||
#define force_successful_syscall_return() (alpha_task_regs(current)->r0 = 0)
|
||||
#define force_successful_syscall_return() (task_pt_regs(current)->r0 = 0)
|
||||
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user