Skip to contentSkip to conversation

mips: namespace pollution: dump_regs() -> elf_dump_regs()

PATCH Applied Al Viro 3 participants 5 messages Dec 16, 2005 – Dec 20, 2005 MIPS

lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---

 arch/mips/kernel/process.c |    4 ++--
 include/asm-mips/elf.h     |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

7cb0f5ab7ecf09fc83483f3f2b0d2005d789dba5

arch/mips/kernel/process.c +2 -2
index dd72577..0476a4d 100644
@@ -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;
 }
include/asm-mips/elf.h +2 -2
index d2c9a25..851f013 100644
@@ -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)
Signature · 1 line
0.99.9.GIT
Applied
#1 lore raw
Quoted 3 lines · 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()

Applied.

#2 lore raw
In reply to Al Viro
Quoted 3 lines · 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()

I guess drivers should be fixed not to use generic names in the first
place -> s/dump_regs/frobnicator_dump_regs/, etc.

Maciej

author
#3 lore raw
Quoted 8 lines · Maciej W. Rozycki
Quoted 3 lines · 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()

I guess drivers should be fixed not to use generic names in the first
place -> s/dump_regs/frobnicator_dump_regs/, etc.

No. If nothing else, it's far less work to keep the headers reasonably clean than to slap prefices on every damn static-in-file function out there. Leads to more readable code in drivers, too...

#4 lore raw
Quoted 5 lines · Al Viro
Quoted 2 lines

I guess drivers should be fixed not to use generic names in the first
place -> s/dump_regs/frobnicator_dump_regs/, etc.

No. If nothing else, it's far less work to keep the headers reasonably clean than to slap prefices on every damn static-in-file function

That's the duty of the respective maintainers. You don't expect one to
have a private printk() (or whatever -- pick your favourite) function in a driver and demand the global one to be renamed so that their own one keeps working.

Quoted 1 line

out there. Leads to more readable code in drivers, too...

Well, that's just a reason to keep namespace prefixes short...

Maciej