kernel: Interaction of braces with #ifdefs was breaking the build.
authorDavid Cock <david.cock@inf.ethz.ch>
Fri, 14 Aug 2015 09:46:19 +0000 (11:46 +0200)
committerDavid Cock <david.cock@inf.ethz.ch>
Fri, 14 Aug 2015 09:46:19 +0000 (11:46 +0200)
Signed-off-by: David Cock <david.cock@inf.ethz.ch>

kernel/dispatch.c

index bcdfabc..b933160 100644 (file)
@@ -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