resolved merge conflicts with futex code

2013-06-02 16:42:08 +09:00
parent 5d78660011 2627d4df55
commit 4a27a65cb0
39 changed files with 2539 additions and 2144 deletions
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -222,8 +222,10 @@ int main(void)

 #ifdef DCFA_KMOD
 	mc_cmd_client_init();
+#ifdef CMD_DCFA
 	ibmic_cmd_init();
 #endif
+#endif

 #ifdef DCFA_RUN
 	kputs("DCFA begin\n");