Blackfin: flat: Use %x to format u32

geertu · torvalds · commit cb0fbbf22aa1 · 2017-07-17T11:40:33.000-07:00
Several variables had their types changed from unsigned long to u32, but the printk()-style format to print them wasn't updated, leading to: arch/blackfin/kernel/flat.c: In function 'bfin_get_addr_from_rp': arch/blackfin/kernel/flat.c:35:3: warning: format '%lx' expects argument of type 'long unsigned int', but argument 2 has type 'u32' [-Wformat] arch/blackfin/kernel/flat.c: In function 'bfin_put_addr_at_rp': arch/blackfin/kernel/flat.c:80:3: warning: format '%lx' expects argument of type 'long unsigned int', but argument 2 has type 'u32' [-Wformat] Fixes: 468138d ("binfmt_flat: flat_{get,put}_addr_from_rp() should be able to fail") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/arch/blackfin/kernel/flat.c b/arch/blackfin/kernel/flat.c
@@ -32,7 +32,7 @@ unsigned long bfin_get_addr_from_rp(u32 *ptr,
 		break;
 
 	case FLAT_BFIN_RELOC_TYPE_32_BIT:
-		pr_debug("*ptr = %lx", get_unaligned(ptr));
+		pr_debug("*ptr = %x", get_unaligned(ptr));
 		val = get_unaligned(ptr);
 		break;
 
@@ -77,7 +77,7 @@ void bfin_put_addr_at_rp(u32 *ptr, u32 addr, u32 relval)
 
 	case FLAT_BFIN_RELOC_TYPE_32_BIT:
 		put_unaligned(addr, ptr);
-		pr_debug("new ptr =%lx", get_unaligned(ptr));
+		pr_debug("new ptr =%x", get_unaligned(ptr));
 		break;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ unsigned long bfin_get_addr_from_rp(u32 *ptr,`
`32`	`32`	`break;`
`33`	`33`
`34`	`34`	`case FLAT_BFIN_RELOC_TYPE_32_BIT:`
`35`		`- pr_debug("*ptr = %lx", get_unaligned(ptr));`
	`35`	`+ pr_debug("*ptr = %x", get_unaligned(ptr));`
`36`	`36`	`val = get_unaligned(ptr);`
`37`	`37`	`break;`
`38`	`38`
`@@ -77,7 +77,7 @@ void bfin_put_addr_at_rp(u32 *ptr, u32 addr, u32 relval)`
`77`	`77`
`78`	`78`	`case FLAT_BFIN_RELOC_TYPE_32_BIT:`
`79`	`79`	`put_unaligned(addr, ptr);`
`80`		`- pr_debug("new ptr =%lx", get_unaligned(ptr));`
	`80`	`+ pr_debug("new ptr =%x", get_unaligned(ptr));`
`81`	`81`	`break;`
`82`	`82`	`}`
`83`	`83`	`}`