Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 3e073367a57d41e506f20aebb98e308387ce3090

Authored by Michael Cree
Committed by Matt Turner
1 parent 7b598cdd03
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

alpha: Fix printk format errors 

When compiling alpha generic build get errors such as:
arch/alpha/kernel/err_marvel.c: In function ‘marvel_print_err_cyc’:
arch/alpha/kernel/err_marvel.c:119: error: format ‘%ld’ expects type ‘long int’, but argument 6 has type ‘u64’

Replaced a number of %ld format specifiers with %lld since u64
is unsigned long long.

Signed-off-by: Michael Cree <mcree@orcon.net.nz>
Signed-off-by: Matt Turner <mattst88@gmail.com>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

arch/alpha/kernel/err_marvel.c
Diff comments   View file @ 3e07336
... ... @@ -109,7 +109,7 @@
109 109 #define IO7__ERR_CYC__CYCLE__M (0x7)
110 110  
111 111 printk("%s Packet In Error: %s\n"
112   - "%s Error in %s, cycle %ld%s%s\n",
  112 + "%s Error in %s, cycle %lld%s%s\n",
113 113 err_print_prefix,
114 114 packet_desc[EXTRACT(err_cyc, IO7__ERR_CYC__PACKET)],
115 115 err_print_prefix,
... ... @@ -313,7 +313,7 @@
313 313 }
314 314  
315 315 printk("%s Up Hose Garbage Symptom:\n"
316   - "%s Source Port: %ld - Dest PID: %ld - OpCode: %s\n",
  316 + "%s Source Port: %lld - Dest PID: %lld - OpCode: %s\n",
317 317 err_print_prefix,
318 318 err_print_prefix,
319 319 EXTRACT(ugbge_sym, IO7__PO7_UGBGE_SYM__UPH_SRC_PORT),
... ... @@ -552,7 +552,7 @@
552 552 #define IO7__POX_SPLCMPLT__REM_BYTE_COUNT__M (0xfff)
553 553  
554 554 printk("%s Split Completion Error:\n"
555   - "%s Source (Bus:Dev:Func): %ld:%ld:%ld\n",
  555 + "%s Source (Bus:Dev:Func): %lld:%lld:%lld\n",
556 556 err_print_prefix,
557 557 err_print_prefix,
558 558 EXTRACT(spl_cmplt, IO7__POX_SPLCMPLT__SOURCE_BUS),