diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-03-24 10:09:59 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-03-24 13:01:50 -0400 |
commit | 41a8198f61d858bcad7ef705d5d3ec3e3a8dea4a (patch) | |
tree | 96b7249cb3e986a05a843e193d2e474a1840726d /arch/mips/mm | |
parent | bf9f88a2192aaee6f1bbff50175aa68ff107355e (diff) |
[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: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mm')
-rw-r--r-- | arch/mips/mm/cerr-sb1.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/mips/mm/cerr-sb1.c b/arch/mips/mm/cerr-sb1.c index 11a916629d3b..4c72e650f9b6 100644 --- a/arch/mips/mm/cerr-sb1.c +++ b/arch/mips/mm/cerr-sb1.c | |||
@@ -177,8 +177,8 @@ extern void check_bus_watcher(void); | |||
177 | 177 | ||
178 | asmlinkage void sb1_cache_error(void) | 178 | asmlinkage void sb1_cache_error(void) |
179 | { | 179 | { |
180 | uint64_t cerr_dpa; | ||
181 | uint32_t errctl, cerr_i, cerr_d, dpalo, dpahi, eepc, res; | 180 | uint32_t errctl, cerr_i, cerr_d, dpalo, dpahi, eepc, res; |
181 | unsigned long long cerr_dpa; | ||
182 | 182 | ||
183 | #ifdef CONFIG_SIBYTE_BW_TRACE | 183 | #ifdef CONFIG_SIBYTE_BW_TRACE |
184 | /* Freeze the trace buffer now */ | 184 | /* Freeze the trace buffer now */ |
@@ -329,8 +329,9 @@ static uint32_t extract_ic(unsigned short addr, int data) | |||
329 | { | 329 | { |
330 | unsigned short way; | 330 | unsigned short way; |
331 | int valid; | 331 | int valid; |
332 | uint64_t taglo, va, tlo_tmp; | ||
333 | uint32_t taghi, taglolo, taglohi; | 332 | uint32_t taghi, taglolo, taglohi; |
333 | unsigned long long taglo, va; | ||
334 | uint64_t tlo_tmp; | ||
334 | uint8_t lru; | 335 | uint8_t lru; |
335 | int res = 0; | 336 | int res = 0; |
336 | 337 | ||
@@ -484,8 +485,8 @@ static uint32_t extract_dc(unsigned short addr, int data) | |||
484 | { | 485 | { |
485 | int valid, way; | 486 | int valid, way; |
486 | unsigned char state; | 487 | unsigned char state; |
487 | uint64_t taglo, pa; | ||
488 | uint32_t taghi, taglolo, taglohi; | 488 | uint32_t taghi, taglolo, taglohi; |
489 | unsigned long long taglo, pa; | ||
489 | uint8_t ecc, lru; | 490 | uint8_t ecc, lru; |
490 | int res = 0; | 491 | int res = 0; |
491 | 492 | ||
@@ -535,8 +536,8 @@ static uint32_t extract_dc(unsigned short addr, int data) | |||
535 | } | 536 | } |
536 | 537 | ||
537 | if (data) { | 538 | if (data) { |
538 | uint64_t datalo; | ||
539 | uint32_t datalohi, datalolo, datahi; | 539 | uint32_t datalohi, datalolo, datahi; |
540 | unsigned long long datalo; | ||
540 | int offset; | 541 | int offset; |
541 | char bad_ecc = 0; | 542 | char bad_ecc = 0; |
542 | 543 | ||