Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 461c6a30eca6f25add1dadb9fd8a1d8e89a6e627

Authored by Sunil Mushran
Committed by Mark Fasheh
1 parent 01af482037
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ocfs2/net: Silence build warnings on sparc64 

suseconds_t is type long on most arches except sparc64 where it is type int.
This patch silences the following warnings that are generated when building
on it.

netdebug.c: In function 'nst_seq_show':
netdebug.c:152: warning: format '%lu' expects type 'long unsigned int', but argument 13 has type 'suseconds_t'
netdebug.c:152: warning: format '%lu' expects type 'long unsigned int', but argument 15 has type 'suseconds_t'
netdebug.c:152: warning: format '%lu' expects type 'long unsigned int', but argument 17 has type 'suseconds_t'
netdebug.c: In function 'sc_seq_show':
netdebug.c:332: warning: format '%lu' expects type 'long unsigned int', but argument 19 has type 'suseconds_t'
netdebug.c:332: warning: format '%lu' expects type 'long unsigned int', but argument 21 has type 'suseconds_t'
netdebug.c:332: warning: format '%lu' expects type 'long unsigned int', but argument 23 has type 'suseconds_t'
netdebug.c:332: warning: format '%lu' expects type 'long unsigned int', but argument 25 has type 'suseconds_t'
netdebug.c:332: warning: format '%lu' expects type 'long unsigned int', but argument 27 has type 'suseconds_t'
netdebug.c:332: warning: format '%lu' expects type 'long unsigned int', but argument 29 has type 'suseconds_t'

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

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

fs/ocfs2/cluster/netdebug.c
Diff comments   View file @ 461c6a3
... ... @@ -146,8 +146,10 @@
146 146 nst->st_task->comm, nst->st_node,
147 147 nst->st_sc, nst->st_id, nst->st_msg_type,
148 148 nst->st_msg_key,
149   - nst->st_sock_time.tv_sec, nst->st_sock_time.tv_usec,
150   - nst->st_send_time.tv_sec, nst->st_send_time.tv_usec,
  149 + nst->st_sock_time.tv_sec,
  150 + (unsigned long)nst->st_sock_time.tv_usec,
  151 + nst->st_send_time.tv_sec,
  152 + (unsigned long)nst->st_send_time.tv_usec,
151 153 nst->st_status_time.tv_sec,
152 154 nst->st_status_time.tv_usec);
153 155 }
... ... @@ -274,7 +276,7 @@
274 276 return sc; /* unused, just needs to be null when done */
275 277 }
276 278  
277   -#define TV_SEC_USEC(TV) TV.tv_sec, TV.tv_usec
  279 +#define TV_SEC_USEC(TV) TV.tv_sec, (unsigned long)TV.tv_usec
278 280  
279 281 static int sc_seq_show(struct seq_file *seq, void *v)
280 282 {