Fix arrakis merge errors
authorSimon Gerber <simon.gerber@inf.ethz.ch>
Fri, 14 Aug 2015 07:16:19 +0000 (09:16 +0200)
committerSimon Gerber <simon.gerber@inf.ethz.ch>
Fri, 14 Aug 2015 07:16:19 +0000 (09:16 +0200)
Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>

include/barrelfish_kpi/capabilities.h
kernel/arch/x86_64/syscall.c

index b980be0..1800ff9 100644 (file)
@@ -220,11 +220,11 @@ enum dispatcher_cmd {
     DispatcherCmd_PerfMon,          ///< Performance monitoring
     DispatcherCmd_SetupGuest,       ///< Set up the DCB of a guest domain
     DispatcherCmd_DumpPTables,      ///< Dump hw page tables of dispatcher
-    DispatcherCmd_DumpCapabilities  ///< Dump capabilities of dispatcher
+    DispatcherCmd_DumpCapabilities, ///< Dump capabilities of dispatcher
     DispatcherCmd_Vmread,           ///< Execute vmread on the current and active VMCS      
     DispatcherCmd_Vmwrite,          ///< Execute vmwrite on the current and active VMCS
     DispatcherCmd_Vmptrld,          ///< Make VMCS clear and inactive
-    DispatcherCmd_Vmclear           ///< Make VMCS current and active 
+    DispatcherCmd_Vmclear,          ///< Make VMCS current and active 
 };
 
 /**
index 8dd82b3..3879f03 100644 (file)
@@ -1034,7 +1034,7 @@ static invocation_handler_t invocations[ObjType_Num][CAP_MAX_CMD] = {
         [DispatcherCmd_SetupGuest] = handle_dispatcher_setup_guest,
 #endif
         [DispatcherCmd_DumpPTables]  = dispatcher_dump_ptables,
-        [DispatcherCmd_DumpCapabilities] = dispatcher_dump_capabilities
+        [DispatcherCmd_DumpCapabilities] = dispatcher_dump_capabilities,
        [DispatcherCmd_Vmread] = handle_vmread,
        [DispatcherCmd_Vmwrite] = handle_vmwrite,
        [DispatcherCmd_Vmptrld] = handle_vmptrld,