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

Commit 41a8198f authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] SB1: Fix pile of gcc's bogus format string warnings. 



  CC      arch/mips/mm/cerr-sb1.o
arch/mips/mm/cerr-sb1.c: In function 'sb1_cache_error':
arch/mips/mm/cerr-sb1.c:235: warning: format '%010llx' expects type 'long long unsigned int', but argument 2 has type 'uint64_t'
arch/mips/mm/cerr-sb1.c: In function 'extract_ic':
arch/mips/mm/cerr-sb1.c:385: warning: format '%016llx' expects type 'long long unsigned int', but argument 3 has type 'uint64_t'
arch/mips/mm/cerr-sb1.c:385: warning: format '%016llX' expects type 'long long unsigned int', but argument 6 has type 'uint64_t'
arch/mips/mm/cerr-sb1.c: In function 'extract_dc':
arch/mips/mm/cerr-sb1.c:523: warning: format '%010llx' expects type 'long long unsigned int', but argument 3 has type 'uint64_t'
arch/mips/mm/cerr-sb1.c:523: warning: format '%016llX' expects type 'long long unsigned int', but argument 7 has type 'uint64_t'
arch/mips/mm/cerr-sb1.c:570: warning: format '%016llX' expects type 'long long unsigned int', but argument 3 has type 'uint64_t'
  LD      arch/mips/mm/built-in.o

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent bf9f88a2

arch/mips/mm/cerr-sb1.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -177,8 +177,8 @@ extern void check_bus_watcher(void); 




asmlinkage void sb1_cache_error(void)

asmlinkage void sb1_cache_error(void)

{

{

	uint64_t cerr_dpa;

	uint32_t errctl, cerr_i, cerr_d, dpalo, dpahi, eepc, res;

	uint32_t errctl, cerr_i, cerr_d, dpalo, dpahi, eepc, res;

	unsigned long long cerr_dpa;





#ifdef CONFIG_SIBYTE_BW_TRACE

#ifdef CONFIG_SIBYTE_BW_TRACE

	/* Freeze the trace buffer now */

	/* Freeze the trace buffer now */
@@ -329,8 +329,9 @@ static uint32_t extract_ic(unsigned short addr, int data) 
{

{

	unsigned short way;

	unsigned short way;

	int valid;

	int valid;

	uint64_t taglo, va, tlo_tmp;

	uint32_t taghi, taglolo, taglohi;

	uint32_t taghi, taglolo, taglohi;

	unsigned long long taglo, va;

	uint64_t tlo_tmp;

	uint8_t lru;

	uint8_t lru;

	int res = 0;

	int res = 0;
@@ -484,8 +485,8 @@ static uint32_t extract_dc(unsigned short addr, int data) 
{

{

	int valid, way;

	int valid, way;

	unsigned char state;

	unsigned char state;

	uint64_t taglo, pa;

	uint32_t taghi, taglolo, taglohi;

	uint32_t taghi, taglolo, taglohi;

	unsigned long long taglo, pa;

	uint8_t ecc, lru;

	uint8_t ecc, lru;

	int res = 0;

	int res = 0;
@@ -535,8 +536,8 @@ static uint32_t extract_dc(unsigned short addr, int data) 
		}

		}





		if (data) {

		if (data) {

			uint64_t datalo;

			uint32_t datalohi, datalolo, datahi;

			uint32_t datalohi, datalolo, datahi;

			unsigned long long datalo;

			int offset;

			int offset;

			char bad_ecc = 0;

			char bad_ecc = 0;