From 6bbd2da69c5c2b8ab57cc2171b9abe2c9b82f53e Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Wed, 31 Jan 2018 10:11:29 -0800 Subject: [PATCH] ANDROID: Remove duplicate security fix Merge resolution problem Change-Id: I763be7d3737179171cab26414dfea8315e5bc655 Signed-off-by: Dmitry Shmidt --- include/linux/bpf.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index fe1e65d0ae3a..0961516d9de0 100644 --- 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 */ -- 2.20.1