Merge branch 'lwip_dev' into devel

[palacios.git] / geekos / src / geekos / timer.c

diff --git a/palacios/src/geekos/timer.c b/geekos/src/geekos/timer.c
similarity index 99%
rename from palacios/src/geekos/timer.c
rename to geekos/src/geekos/timer.c
index 0e3804f..964f50b 100644 (file)
--- a/palacios/src/geekos/timer.c
+++ b/geekos/src/geekos/timer.c
@@ -23,7 +23,9 @@
 #include <geekos/io_defs.h>
 
 /* PAD this currently is in nvram.c */
+/* JRL: This is completely broken
 extern void deliver_timer_interrupt_to_vmm(uint_t period_us);
+*/
 
 /* JRL Add a cpu frequency measurement */
 uint_t cpu_khz_freq;
@@ -216,9 +218,9 @@ static void Timer_Interrupt_Handler(struct Interrupt_State* state)
     
   }
   
-  
+  /* JRL: Broken,  
   deliver_timer_interrupt_to_vmm(1000000/HZ);
-  
+  */
   End_IRQ(state);
 }