Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux-2.6-microblaze.git] / include / linux / filter.h

diff --git a/include/linux/filter.h b/include/linux/filter.h
index 8252572..1c6b6d9 100644 (file)
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -502,13 +502,11 @@ static inline bool insn_is_zext(const struct bpf_insn *insn)
                offsetof(TYPE, MEMBER);                                         \
        })
 
-#ifdef CONFIG_COMPAT
 /* A struct sock_filter is architecture independent. */
 struct compat_sock_fprog {
        u16             len;
        compat_uptr_t   filter; /* struct sock_filter * */
 };
-#endif
 
 struct sock_fprog_kern {
        u16                     len;
@@ -1278,6 +1276,8 @@ struct bpf_sockopt_kern {
        s32             retval;
 };
 
+int copy_bpf_fprog_from_user(struct sock_fprog *dst, void __user *src, int len);
+
 struct bpf_sk_lookup_kern {
        u16             family;
        u16             protocol;