[Devel] [PATCH VZ10 v4 38/44] fixup! ve: Implement per ve randomize_va_space

[Vladimir Riabchun]

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

This include can't be dropped due to randomize_va_space usage.
With CONFIG_VE it requires ve_struct definition, which
can't be added in mm.h due to other weird compilation issues.

Instead, guard this include.

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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 3757c814c525..adaa759dea44 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -46,7 +46,9 @@
 #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.47.1