Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d56efda4510b1c6be3bd5ceb3e6dd3a4d64396f3

Authored by Al Viro
Committed by
1 parent 830e9c002a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

arch/mips/kernel/process.c
Diff comments   View file @ d56efda
... ... @@ -205,7 +205,7 @@
205 205 return 1;
206 206 }
207 207  
208   -void dump_regs(elf_greg_t *gp, struct pt_regs *regs)
  208 +void elf_dump_regs(elf_greg_t *gp, struct pt_regs *regs)
209 209 {
210 210 int i;
211 211  
... ... @@ -231,7 +231,7 @@
231 231 {
232 232 struct thread_info *ti = tsk->thread_info;
233 233 long ksp = (unsigned long)ti + THREAD_SIZE - 32;
234   - dump_regs(&(*regs)[0], (struct pt_regs *) ksp - 1);
  234 + elf_dump_regs(&(*regs)[0], (struct pt_regs *) ksp - 1);
235 235 return 1;
236 236 }
237 237  
include/asm-mips/elf.h
Diff comments   View file @ d56efda
... ... @@ -277,12 +277,12 @@
277 277  
278 278 struct task_struct;
279 279  
280   -extern void dump_regs(elf_greg_t *, struct pt_regs *regs);
  280 +extern void elf_dump_regs(elf_greg_t *, struct pt_regs *regs);
281 281 extern int dump_task_regs (struct task_struct *, elf_gregset_t *);
282 282 extern int dump_task_fpu(struct task_struct *, elf_fpregset_t *);
283 283  
284 284 #define ELF_CORE_COPY_REGS(elf_regs, regs) \
285   - dump_regs((elf_greg_t *)&(elf_regs), regs);
  285 + elf_dump_regs((elf_greg_t *)&(elf_regs), regs);
286 286 #define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs)
287 287 #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) \
288 288 dump_task_fpu(tsk, elf_fpregs)