From a31cfe8483b48775351ac75b9c858209e3f168e2 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 16 Dec 2005 22:40:47 +0000 Subject: [PATCH] --- yaml --- r: 17775 b: refs/heads/master c: d56efda4510b1c6be3bd5ceb3e6dd3a4d64396f3 h: refs/heads/master i: 17773: 446aec4371bdb257b4e8b132dca4eefc1f2e2f17 17771: cef3aab4ff1460a78fdfb425878b24f19a6478d4 17767: e399905d4071e1abb580299ae6b95a654bf8c5b0 17759: 7838c68e43778136e15b5672403f3871c9cdd81c v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/process.c | 4 ++-- trunk/include/asm-mips/elf.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5d3c284ffd96..9e126915e6b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 830e9c002a5864e8cfcc55d3875cdebdd4168b00 +refs/heads/master: d56efda4510b1c6be3bd5ceb3e6dd3a4d64396f3 diff --git a/trunk/arch/mips/kernel/process.c b/trunk/arch/mips/kernel/process.c index dd725779d91f..0476a4dce14e 100644 --- a/trunk/arch/mips/kernel/process.c +++ b/trunk/arch/mips/kernel/process.c @@ -205,7 +205,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *r) return 1; } -void dump_regs(elf_greg_t *gp, struct pt_regs *regs) +void elf_dump_regs(elf_greg_t *gp, struct pt_regs *regs) { int i; @@ -231,7 +231,7 @@ int dump_task_regs (struct task_struct *tsk, elf_gregset_t *regs) { struct thread_info *ti = tsk->thread_info; long ksp = (unsigned long)ti + THREAD_SIZE - 32; - dump_regs(&(*regs)[0], (struct pt_regs *) ksp - 1); + elf_dump_regs(&(*regs)[0], (struct pt_regs *) ksp - 1); return 1; } diff --git a/trunk/include/asm-mips/elf.h b/trunk/include/asm-mips/elf.h index d2c9a25f8459..851f013adad3 100644 --- a/trunk/include/asm-mips/elf.h +++ b/trunk/include/asm-mips/elf.h @@ -277,12 +277,12 @@ do { \ struct task_struct; -extern void dump_regs(elf_greg_t *, struct pt_regs *regs); +extern void elf_dump_regs(elf_greg_t *, struct pt_regs *regs); extern int dump_task_regs (struct task_struct *, elf_gregset_t *); extern int dump_task_fpu(struct task_struct *, elf_fpregset_t *); #define ELF_CORE_COPY_REGS(elf_regs, regs) \ - dump_regs((elf_greg_t *)&(elf_regs), regs); + elf_dump_regs((elf_greg_t *)&(elf_regs), regs); #define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs) #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) \ dump_task_fpu(tsk, elf_fpregs)