Skip to content

Commit 186197b

Browse files
committed
netfilter: fix seq_printf type mismatch warning
The return type of atomic64_read() varies depending on arch. The arm64 version is being changed from long long to long in the mainline for v3.16, causing a seq_printf type mismatch (%llu) in guid_ctrl_proc_show(). This commit fixes the type mismatch by casting atomic64_read() to u64. Change-Id: Iae0a6bd4314f5686a9f4fecbe6203e94ec0870de Signed-off-by: Sherman Yin <[email protected]>
1 parent 092f526 commit 186197b

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

net/netfilter/xt_qtaguid.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,18 +1950,18 @@ static int qtaguid_ctrl_proc_show(struct seq_file *m, void *v)
19501950
"match_found_no_sk_in_ct=%llu "
19511951
"match_no_sk=%llu "
19521952
"match_no_sk_file=%llu\n",
1953-
atomic64_read(&qtu_events.sockets_tagged),
1954-
atomic64_read(&qtu_events.sockets_untagged),
1955-
atomic64_read(&qtu_events.counter_set_changes),
1956-
atomic64_read(&qtu_events.delete_cmds),
1957-
atomic64_read(&qtu_events.iface_events),
1958-
atomic64_read(&qtu_events.match_calls),
1959-
atomic64_read(&qtu_events.match_calls_prepost),
1960-
atomic64_read(&qtu_events.match_found_sk),
1961-
atomic64_read(&qtu_events.match_found_sk_in_ct),
1962-
atomic64_read(&qtu_events.match_found_no_sk_in_ct),
1963-
atomic64_read(&qtu_events.match_no_sk),
1964-
atomic64_read(&qtu_events.match_no_sk_file));
1953+
(u64)atomic64_read(&qtu_events.sockets_tagged),
1954+
(u64)atomic64_read(&qtu_events.sockets_untagged),
1955+
(u64)atomic64_read(&qtu_events.counter_set_changes),
1956+
(u64)atomic64_read(&qtu_events.delete_cmds),
1957+
(u64)atomic64_read(&qtu_events.iface_events),
1958+
(u64)atomic64_read(&qtu_events.match_calls),
1959+
(u64)atomic64_read(&qtu_events.match_calls_prepost),
1960+
(u64)atomic64_read(&qtu_events.match_found_sk),
1961+
(u64)atomic64_read(&qtu_events.match_found_sk_in_ct),
1962+
(u64)atomic64_read(&qtu_events.match_found_no_sk_in_ct),
1963+
(u64)atomic64_read(&qtu_events.match_no_sk),
1964+
(u64)atomic64_read(&qtu_events.match_no_sk_file));
19651965

19661966
/* Count the following as part of the last item_index */
19671967
prdebug_full_state(0, "proc ctrl");

0 commit comments

Comments
 (0)