Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9efd921 authored by Sherman Yin's avatar Sherman Yin Committed by Ian Maund
Browse files

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: default avatarSherman Yin <shermanyin@gmail.com>
Git-commit: 186197b12c189b9572a9e739d954674af77549ee
Git-repo: https://android.googlesource.com/kernel/common.git


Signed-off-by: default avatarIan Maund <imaund@codeaurora.org>
parent e785b437

net/netfilter/xt_qtaguid.c

+12 −12
Original line number Diff line number Diff line
@@ -1953,18 +1953,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");