[Devel] [VZ10 19/21] ve/binfmt_elf: Include ve.h only when CONFIG_VE

[Vladimir Riabchun]

net_namespace.h inlcudes skbuff.h, which uses ns_to_kernel_old_timeval
function. Unfortunately, compat_binfmt_elf.c redefines this function,
causing return type mismatch.

Don't include ve.h in binfmt_elf when !CONFIG_VE

https://virtuozzo.atlassian.net/browse/VSTOR-130116

Feature: !CONFIG_VE build
Signed-off-by: Vladimir Riabchun <vladimir.riabchun at virtuozzo.com>
---
 fs/binfmt_elf.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 3757c814c525..246ccc8127e0 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -46,7 +46,11 @@
 #include <linux/cred.h>
 #include <linux/dax.h>
 #include <linux/uaccess.h>
+
+#ifdef CONFIG_VE
 #include <linux/ve.h>
+#endif
+
 #include <linux/rseq.h>
 #include <asm/param.h>
 #include <asm/page.h>
-- 
2.43.0