Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6183d68b authored by Sven Schnelle's avatar Sven Schnelle Committed by Helge Deller
Browse files

parisc: use pr_debug() in kernel/module.c 



Instead of using our own version, switch to the generic
pr_() calls.

Signed-off-by: default avatarSven Schnelle <svens@stackframe.org>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent e4eab1ce

arch/parisc/kernel/module.c

+19 −25
Original line number Diff line number Diff line
@@ -53,12 +53,6 @@ 
#include <asm/unwind.h>

#include <asm/sections.h>



#if 0

#define DEBUGP printk

#else

#define DEBUGP(fmt...)

#endif



#define RELOC_REACHABLE(val, bits) \

	(( ( !((val) & (1<<((bits)-1))) && ((val)>>(bits)) != 0 )  ||	\

	     ( ((val) & (1<<((bits)-1))) && ((val)>>(bits)) != (((__typeof__(val))(~0))>>((bits)+2)))) ? \
@@ -386,7 +380,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend) 


	got[i].addr = value;

 out:

	DEBUGP("GOT ENTRY %d[%x] val %lx\n", i, i*sizeof(struct got_entry),

	pr_debug("GOT ENTRY %d[%lx] val %lx\n", i, i*sizeof(struct got_entry),

	       value);

	return i * sizeof(struct got_entry);

}
@@ -539,7 +533,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs, 
	//unsigned long dp = (unsigned long)$global$;

	register unsigned long dp asm ("r27");



	DEBUGP("Applying relocate section %u to %u\n", relsec,

	pr_debug("Applying relocate section %u to %u\n", relsec,

	       targetsec);

	for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {

		/* This is where to make the change */
@@ -563,7 +557,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs, 


#if 0

#define r(t) ELF32_R_TYPE(rel[i].r_info)==t ? #t :

		DEBUGP("Symbol %s loc 0x%x val 0x%x addend 0x%x: %s\n",

		pr_debug("Symbol %s loc 0x%x val 0x%x addend 0x%x: %s\n",

			strtab + sym->st_name,

			(uint32_t)loc, val, addend,

			r(R_PARISC_PLABEL32)
@@ -683,7 +677,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs, 
	Elf_Addr loc0;

	unsigned int targetsec = sechdrs[relsec].sh_info;



	DEBUGP("Applying relocate section %u to %u\n", relsec,

	pr_debug("Applying relocate section %u to %u\n", relsec,

	       targetsec);

	for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {

		/* This is where to make the change */
@@ -725,7 +719,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs, 
		case R_PARISC_LTOFF21L:

			/* LT-relative; left 21 bits */

			val = get_got(me, val, addend);

			DEBUGP("LTOFF21L Symbol %s loc %p val %lx\n",

			pr_debug("LTOFF21L Symbol %s loc %p val %llx\n",

			       strtab + sym->st_name,

			       loc, val);

			val = lrsel(val, 0);
@@ -736,14 +730,14 @@ int apply_relocate_add(Elf_Shdr *sechdrs, 
			/* LT-relative; right 14 bits */

			val = get_got(me, val, addend);

			val = rrsel(val, 0);

			DEBUGP("LTOFF14R Symbol %s loc %p val %lx\n",

			pr_debug("LTOFF14R Symbol %s loc %p val %llx\n",

			       strtab + sym->st_name,

			       loc, val);

			*loc = mask(*loc, 14) | reassemble_14(val);

			break;

		case R_PARISC_PCREL22F:

			/* PC-relative; 22 bits */

			DEBUGP("PCREL22F Symbol %s loc %p val %lx\n",

			pr_debug("PCREL22F Symbol %s loc %p val %llx\n",

			       strtab + sym->st_name,

			       loc, val);

			val += addend;
@@ -775,7 +769,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs, 
					val = get_stub(me, val, addend, ELF_STUB_GOT,

						       loc0, targetsec);

			}

			DEBUGP("STUB FOR %s loc %lx, val %lx+%lx at %lx\n", 

			pr_debug("STUB FOR %s loc %px, val %llx+%llx at %llx\n",

			       strtab + sym->st_name, loc, sym->st_value,

			       addend, val);

			val = (val - dot - 8)/4;
@@ -805,14 +799,14 @@ int apply_relocate_add(Elf_Shdr *sechdrs, 
			/* 64-bit function address */

			if(in_local(me, (void *)(val + addend))) {

				*loc64 = get_fdesc(me, val+addend);

				DEBUGP("FDESC for %s at %p points to %lx\n",

				pr_debug("FDESC for %s at %llx points to %llx\n",

				       strtab + sym->st_name, *loc64,

				       ((Elf_Fdesc *)*loc64)->addr);

			} else {

				/* if the symbol is not local to this

				 * module then val+addend is a pointer

				 * to the function descriptor */

				DEBUGP("Non local FPTR64 Symbol %s loc %p val %lx\n",

				pr_debug("Non local FPTR64 Symbol %s loc %p val %llx\n",

				       strtab + sym->st_name,

				       loc, val);

				*loc64 = val + addend;
@@ -843,7 +837,7 @@ register_unwind_table(struct module *me, 
	end = table + sechdrs[me->arch.unwind_section].sh_size;

	gp = (Elf_Addr)me->core_layout.base + me->arch.got_offset;



	DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",

	pr_debug("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",

	       me->arch.unwind_section, table, end, gp);

	me->arch.unwind = unwind_table_add(me->name, 0, gp, table, end);

}
@@ -899,7 +893,7 @@ int module_finalize(const Elf_Ehdr *hdr, 
		}

	}



	DEBUGP("module %s: strtab %p, symhdr %p\n",

	pr_debug("module %s: strtab %p, symhdr %p\n",

	       me->name, strtab, symhdr);



	if(me->arch.got_count > MAX_GOTS) {
@@ -918,7 +912,7 @@ int module_finalize(const Elf_Ehdr *hdr, 
	oldptr = (void *)symhdr->sh_addr;

	newptr = oldptr + 1;	/* we start counting at 1 */

	nsyms = symhdr->sh_size / sizeof(Elf_Sym);

	DEBUGP("OLD num_symtab %lu\n", nsyms);

	pr_debug("OLD num_symtab %lu\n", nsyms);



	for (i = 1; i < nsyms; i++) {

		oldptr++;	/* note, count starts at 1 so preincrement */
@@ -933,7 +927,7 @@ int module_finalize(const Elf_Ehdr *hdr, 


	}

	nsyms = newptr - (Elf_Sym *)symhdr->sh_addr;

	DEBUGP("NEW num_symtab %lu\n", nsyms);

	pr_debug("NEW num_symtab %lu\n", nsyms);

	symhdr->sh_size = nsyms * sizeof(Elf_Sym);



	/* find .altinstructions section */