From: Al Viro 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 Signed-off-by: Andrew Morton --- arch/mips/kernel/process.c | 4 ++-- include/asm-mips/elf.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN arch/mips/kernel/process.c~mips-namespace-pollution-dump_regs-elf_dump_regs arch/mips/kernel/process.c --- devel/arch/mips/kernel/process.c~mips-namespace-pollution-dump_regs-elf_dump_regs 2006-01-04 22:03:08.000000000 -0800 +++ devel-akpm/arch/mips/kernel/process.c 2006-01-04 22:03:08.000000000 -0800 @@ -205,7 +205,7 @@ int dump_fpu(struct pt_regs *regs, elf_f 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 * { 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 -puN include/asm-mips/elf.h~mips-namespace-pollution-dump_regs-elf_dump_regs include/asm-mips/elf.h --- devel/include/asm-mips/elf.h~mips-namespace-pollution-dump_regs-elf_dump_regs 2006-01-04 22:03:08.000000000 -0800 +++ devel-akpm/include/asm-mips/elf.h 2006-01-04 22:03:08.000000000 -0800 @@ -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) _