Merge branch 'lwip_dev' of /home/palacios/palacios into lwip_dev

Conflicts:
	palacios/src/lwip/arch/sys_arch.c

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index e5c0612..8fa36ef 100644 (file)
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -456,7 +456,7 @@ devices/%.o : devices/%.asm
        $(NASM) $(NASM_VMM_OPTS) $< -o devices/$*.o
 
 net/%.o : net/%.c
-       $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS)  $(CC_USER_OPTS) $< -o net/$*.o
+       $(TARGET_CC) -c $(CC_GENERAL_OPTS)  $(CC_USER_OPTS) $< -o net/$*.o
 
 # ----------------------------------------------------------------------
 # Targets -

diff --git a/palacios/src/lwip/arch/sys_arch.c b/palacios/src/lwip/arch/sys_arch.c
index d5fa76d..e390d98 100644 (file)
--- a/palacios/src/lwip/arch/sys_arch.c
+++ b/palacios/src/lwip/arch/sys_arch.c
@@ -188,7 +188,6 @@ current_thread(void)
 }
 
 
-//!!!!!!!!!!!!backto this function later
 /*-----------------------------------------------------------------------------------*/
 sys_thread_t
 sys_thread_new(char *name, void (* function)(void *arg), void *arg, int stacksize, int prio)