From cd1ef1babb7cbb32653b0bd55e500ce910e47362 Mon Sep 17 00:00:00 2001 From: David Cock Date: Fri, 14 Aug 2015 11:46:19 +0200 Subject: [PATCH] kernel: Interaction of braces with #ifdefs was breaking the build. Signed-off-by: David Cock --- kernel/dispatch.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kernel/dispatch.c b/kernel/dispatch.c index bcdfabc..b933160 100644 --- a/kernel/dispatch.c +++ b/kernel/dispatch.c @@ -249,11 +249,12 @@ void __attribute__ ((noreturn)) dispatch(struct dcb *dcb) if(!dcb->is_vm_guest) { resume(disabled_area); + } #if defined(__x86_64__) && !defined(__k1om__) - } else { + else { vmkit_vmenter(dcb); -#endif } +#endif } else { if (disp != NULL) { debug(SUBSYS_DISPATCH, "dispatch %.*s\n", DISP_NAME_LEN, disp->name); @@ -262,8 +263,9 @@ void __attribute__ ((noreturn)) dispatch(struct dcb *dcb) } if(!dcb->is_vm_guest) { execute(disp->dispatcher_run); + } #if defined(__x86_64__) && !defined(__k1om__) - } else { + else { vmkit_vmexec(dcb, (disp) ? disp->dispatcher_run : 0); } #endif -- 1.7.2.5