netfilter: fix seq_printf type mismatch warning
authorSherman Yin <shermanyin@gmail.com>
Thu, 12 Jun 2014 21:35:38 +0000 (14:35 -0700)
committerSherman Yin <shermanyin@gmail.com>
Thu, 12 Jun 2014 21:35:38 +0000 (14:35 -0700)
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 <shermanyin@gmail.com>
net/netfilter/xt_qtaguid.c

index eee667987f7d70e0d9c30e5bad9febbb932e6095..9128933a5b212feebe4591d0b3a624831e022f10 100644 (file)
@@ -1950,18 +1950,18 @@ static int qtaguid_ctrl_proc_show(struct seq_file *m, void *v)
                           "match_found_no_sk_in_ct=%llu "
                           "match_no_sk=%llu "
                           "match_no_sk_file=%llu\n",
-                          atomic64_read(&qtu_events.sockets_tagged),
-                          atomic64_read(&qtu_events.sockets_untagged),
-                          atomic64_read(&qtu_events.counter_set_changes),
-                          atomic64_read(&qtu_events.delete_cmds),
-                          atomic64_read(&qtu_events.iface_events),
-                          atomic64_read(&qtu_events.match_calls),
-                          atomic64_read(&qtu_events.match_calls_prepost),
-                          atomic64_read(&qtu_events.match_found_sk),
-                          atomic64_read(&qtu_events.match_found_sk_in_ct),
-                          atomic64_read(&qtu_events.match_found_no_sk_in_ct),
-                          atomic64_read(&qtu_events.match_no_sk),
-                          atomic64_read(&qtu_events.match_no_sk_file));
+                          (u64)atomic64_read(&qtu_events.sockets_tagged),
+                          (u64)atomic64_read(&qtu_events.sockets_untagged),
+                          (u64)atomic64_read(&qtu_events.counter_set_changes),
+                          (u64)atomic64_read(&qtu_events.delete_cmds),
+                          (u64)atomic64_read(&qtu_events.iface_events),
+                          (u64)atomic64_read(&qtu_events.match_calls),
+                          (u64)atomic64_read(&qtu_events.match_calls_prepost),
+                          (u64)atomic64_read(&qtu_events.match_found_sk),
+                          (u64)atomic64_read(&qtu_events.match_found_sk_in_ct),
+                          (u64)atomic64_read(&qtu_events.match_found_no_sk_in_ct),
+                          (u64)atomic64_read(&qtu_events.match_no_sk),
+                          (u64)atomic64_read(&qtu_events.match_no_sk_file));
 
                /* Count the following as part of the last item_index */
                prdebug_full_state(0, "proc ctrl");