Commit 6bbd2da6 authored Jan 31, 2018 by Dmitry Shmidt

ANDROID: Remove duplicate security fix



Merge resolution problem

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

parent c3a2eda1

include/linux/bpf.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -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 */