arm: fix messed up ifdefs
authorSimon Gerber <simon.gerber@inf.ethz.ch>
Fri, 14 Aug 2015 15:01:15 +0000 (17:01 +0200)
committerSimon Gerber <simon.gerber@inf.ethz.ch>
Fri, 14 Aug 2015 15:25:20 +0000 (17:25 +0200)
Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>

include/barrelfish/ump_impl.h
kernel/dispatch.c

index 627d4fe..31ccaf2 100644 (file)
@@ -200,6 +200,7 @@ static inline volatile struct ump_message *ump_impl_get_next(
     // construct header
     ctrl->epoch = c->epoch;
 
+#ifdef __x86_64__
     if(debug_notify_syscall) {
         printf("ump_impl_get_next while forbidden from %p, %p, %p, %p, %p, %p, %p\n",
                __builtin_return_address(0),
@@ -210,6 +211,7 @@ static inline volatile struct ump_message *ump_impl_get_next(
                __builtin_return_address(5),
                __builtin_return_address(6));
     }
+#endif
 
     volatile struct ump_message *msg = &c->buf[c->pos];
 
index b933160..09cafbe 100644 (file)
@@ -242,18 +242,19 @@ void __attribute__ ((noreturn)) dispatch(struct dcb *dcb)
     if (dcb->disabled) {
         if (disp != NULL) {
             debug(SUBSYS_DISPATCH, "resume %.*s at 0x%" PRIx64 "\n", DISP_NAME_LEN,
-                  disp->name, (uint64_t)registers_get_ip(disabled_area));
+                    disp->name, (uint64_t)registers_get_ip(disabled_area));
             assert(dispatcher_is_disabled_ip(handle,
-                                             registers_get_ip(disabled_area)));
+                        registers_get_ip(disabled_area)));
         }
 
+#if defined(__x86_64__) && !defined(__k1om__)
         if(!dcb->is_vm_guest) {
             resume(disabled_area);
-        }
-#if defined(__x86_64__) && !defined(__k1om__)
-        else {
+        } else {
             vmkit_vmenter(dcb);
         }
+#else
+        resume(disabled_area);
 #endif
     } else {
         if (disp != NULL) {
@@ -261,13 +262,14 @@ void __attribute__ ((noreturn)) dispatch(struct dcb *dcb)
             assert(disp->dispatcher_run != 0);
             disp->disabled = 1;
         }
+#if defined(__x86_64__) && !defined(__k1om__)
         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);
         }
+#else
+        execute(disp->dispatcher_run);
 #endif
     }
 } // end function: dispatch