Commit cb0fbbf2 authored Jul 16, 2017 by Geert Uytterhoeven Committed by Linus Torvalds Jul 17, 2017

Blackfin: flat: Use %x to format u32

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: 468138d7 ("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>

parent 87b2c3fc

arch/blackfin/kernel/flat.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ unsigned long bfin_get_addr_from_rp(u32 *ptr,
	break;		break;

	case FLAT_BFIN_RELOC_TYPE_32_BIT:		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);		val = get_unaligned(ptr);
	break;		break;

	@@ -77,7 +77,7 @@ void bfin_put_addr_at_rp(u32 *ptr, u32 addr, u32 relval)

	case FLAT_BFIN_RELOC_TYPE_32_BIT:		case FLAT_BFIN_RELOC_TYPE_32_BIT:
	put_unaligned(addr, ptr);		put_unaligned(addr, ptr);
	pr_debug("new ptr =%lx", get_unaligned(ptr));		pr_debug("new ptr =%x", get_unaligned(ptr));
	break;		break;
	}		}
	}		}