Commit dcb8f5c8 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso

netfilter: xtables: fix warnings on 32bit platforms

On 32bit archs gcc complains due to cast from void* to u64.
Add intermediate casts to long to silence these warnings.

include/linux/netfilter/x_tables.h:376:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
include/linux/netfilter/x_tables.h:384:15: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
include/linux/netfilter/x_tables.h:391:23: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
include/linux/netfilter/x_tables.h:400:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]

Fixes: 71ae0dff ("netfilter: xtables: use percpu rule counters")
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 8f481b50
...@@ -372,7 +372,7 @@ static inline u64 xt_percpu_counter_alloc(void) ...@@ -372,7 +372,7 @@ static inline u64 xt_percpu_counter_alloc(void)
if (res == NULL) if (res == NULL)
return (u64) -ENOMEM; return (u64) -ENOMEM;
return (__force u64) res; return (u64) (__force unsigned long) res;
} }
return 0; return 0;
...@@ -380,14 +380,14 @@ static inline u64 xt_percpu_counter_alloc(void) ...@@ -380,14 +380,14 @@ static inline u64 xt_percpu_counter_alloc(void)
static inline void xt_percpu_counter_free(u64 pcnt) static inline void xt_percpu_counter_free(u64 pcnt)
{ {
if (nr_cpu_ids > 1) if (nr_cpu_ids > 1)
free_percpu((void __percpu *) pcnt); free_percpu((void __percpu *) (unsigned long) pcnt);
} }
static inline struct xt_counters * static inline struct xt_counters *
xt_get_this_cpu_counter(struct xt_counters *cnt) xt_get_this_cpu_counter(struct xt_counters *cnt)
{ {
if (nr_cpu_ids > 1) if (nr_cpu_ids > 1)
return this_cpu_ptr((void __percpu *) cnt->pcnt); return this_cpu_ptr((void __percpu *) (unsigned long) cnt->pcnt);
return cnt; return cnt;
} }
...@@ -396,7 +396,7 @@ static inline struct xt_counters * ...@@ -396,7 +396,7 @@ static inline struct xt_counters *
xt_get_per_cpu_counter(struct xt_counters *cnt, unsigned int cpu) xt_get_per_cpu_counter(struct xt_counters *cnt, unsigned int cpu)
{ {
if (nr_cpu_ids > 1) if (nr_cpu_ids > 1)
return per_cpu_ptr((void __percpu *) cnt->pcnt, cpu); return per_cpu_ptr((void __percpu *) (unsigned long) cnt->pcnt, cpu);
return cnt; return cnt;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment