ANDROID: Remove duplicate security fix

Merge resolution problem

Change-Id: I763be7d3737179171cab26414dfea8315e5bc655
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index fe1e65d0ae3ab973134741bf8bc510555f8859fd..0961516d9de0f8b31e51abc591bc3a3138fa1a60 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -68,9 +68,6 @@ struct bpf_map {
        atomic_t refcnt;
        atomic_t usercnt;
        struct work_struct work;
-#ifdef CONFIG_SECURITY
-       void *security;
-#endif
 };
 
 /* function argument constraints */