[Devel] [PATCH RHEL7 COMMIT] ve/binfmt_misc: fix compilation outside CONFIG_BINFMT_MISC

Konstantin Khorenko khorenko at virtuozzo.com
Sat Jan 23 05:17:01 PST 2016


The commit is pushed to "branch-rh7-3.10.0-327.3.1-vz7.10.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.3.1.vz7.10.3
------>
commit 52a953a10f378c4ef92052a28b8be20a34a2fb7e
Author: Dmitry Safonov <dsafonov at virtuozzo.com>
Date:   Sat Jan 23 17:17:00 2016 +0400

    ve/binfmt_misc: fix compilation outside CONFIG_BINFMT_MISC
    
    Fix for the next compile error:
    kernel/ve/ve.c: In function ‘ve_destroy’:
    kernel/ve/ve.c:709:10: error: ‘struct ve_struct’ has no member named ‘binfmt_misc’
      kfree(ve->binfmt_misc);
    
    Fixes 4b7d610d45498ac733e92024097dc99402476b27
    ("VE/BINFTM: fix destruction ordering").
    
    Signed-off-by: Dmitry Safonov <dsafonov at virtuozzo.com>
---
 kernel/ve/ve.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/ve/ve.c b/kernel/ve/ve.c
index 643a39d..fbb58ff 100644
--- a/kernel/ve/ve.c
+++ b/kernel/ve/ve.c
@@ -712,7 +712,9 @@ static void ve_destroy(struct cgroup *cg)
 	free_ve_devmnts(ve);
 
 	ve_log_destroy(ve);
+#if IS_ENABLED(CONFIG_BINFMT_MISC)
 	kfree(ve->binfmt_misc);
+#endif
 	free_percpu(ve->sched_lat_ve.cur);
 	kfree(ve->ve_name);
 	kmem_cache_free(ve_cachep, ve);


More information about the Devel mailing list