[PATCH] AVR32: Silence some compile warnings

Silence a few compile warnings which are basically harmless, but
easy to fix.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

4 files changed, 5 insertions, 5 deletions

diff --git a/arch/avr32/kernel/kprobes.c b/arch/avr32/kernel/kprobes.c
index 6caf9e8d8080..ca41fc1edbe1 100644
--- a/arch/avr32/kernel/kprobes.c
+++ b/arch/avr32/kernel/kprobes.c
@@ -109,7 +109,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
         void *addr = (void *)regs->pc;
         int ret = 0;
 
-        pr_debug("kprobe_handler: kprobe_running=%d\n",
+        pr_debug("kprobe_handler: kprobe_running=%p\n",
                  kprobe_running());
 
         /*
diff --git a/arch/avr32/kernel/module.c b/arch/avr32/kernel/module.c
index dfc32f2817b6..b599eae64576 100644
--- a/arch/avr32/kernel/module.c
+++ b/arch/avr32/kernel/module.c
@@ -263,7 +263,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
                          * value of PC.  Just subtract the value of
                          * GOT, and we're done.
                          */
-                        pr_debug("GOTPC: PC=0x%lx, got_offset=0x%lx, core=0x%p\n",
+                        pr_debug("GOTPC: PC=0x%x, got_offset=0x%lx, core=0x%p\n",
                                  relocation, module->arch.got_offset,
                                  module->module_core);
                         relocation -= ((unsigned long)module->module_core
@@ -282,7 +282,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
                             && (relocation & 0xffff0000) != 0xffff0000)
                                 return reloc_overflow(module, "R_AVR32_GOT16S",
                                                       relocation);
-                        pr_debug("GOT reloc @ 0x%lx -> %lu\n",
+                        pr_debug("GOT reloc @ 0x%x -> %u\n",
                                  rel->r_offset, relocation);
                         value = *location;
                         value = ((value & 0xffff0000)
diff --git a/arch/avr32/kernel/ptrace.c b/arch/avr32/kernel/ptrace.c
index 3c89e59029ab..f2e81cd79002 100644
--- a/arch/avr32/kernel/ptrace.c
+++ b/arch/avr32/kernel/ptrace.c
@@ -157,7 +157,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
         unsigned long tmp;
         int ret;
 
-        pr_debug("arch_ptrace(%ld, %ld, %#lx, %#lx)\n",
+        pr_debug("arch_ptrace(%ld, %d, %#lx, %#lx)\n",
                  request, child->pid, addr, data);
 
         pr_debug("ptrace: Enabling monitor mode...\n");
diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c
index 3e6c41039808..70da6894acc1 100644
--- a/arch/avr32/mm/init.c
+++ b/arch/avr32/mm/init.c
@@ -206,7 +206,7 @@ void __init setup_bootmem(void)
 
         if (mem_ramdisk) {
 #ifdef CONFIG_BLK_DEV_INITRD
-                initrd_start = __va(mem_ramdisk->addr);
+                initrd_start = (unsigned long)__va(mem_ramdisk->addr);
                 initrd_end = initrd_start + mem_ramdisk->size;
 
                 print_memory_map("RAMDISK images", mem_ramdisk);