MIPS: Namespace pollution: dump_regs() -> elf_dump_regs()

dump_regs() is used by a bunch of drivers for their internal stuff;
renamed mips instance (one that is seen in system-wide headers)
to elf_dump_regs()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index dd725779d91fa19857e667a9c4131d381a16f410..0476a4dce14e47ac53e811f9a5a63feb9d98b605 100644 (file)
--- a/arch/mips/kernel/process.c
+++ b/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/include/asm-mips/elf.h b/include/asm-mips/elf.h
index d2c9a25f8459cab60a6a3e86438ab7c5ad43f2fc..851f013adad34a4541dad2cfce71f1823cfd15bb 100644 (file)
--- a/include/asm-mips/elf.h
+++ b/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)