--- zzzz-none-000/linux-2.6.28.10/kernel/timer.c	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/kernel/timer.c	2010-05-10 09:05:56.000000000 +0000
@@ -37,6 +37,7 @@
 #include <linux/delay.h>
 #include <linux/tick.h>
 #include <linux/kallsyms.h>
+#include <linux/avm_profile.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -864,7 +865,13 @@
 			spin_unlock_irq(&base->lock);
 			{
 				int preempt_count = preempt_count();
+#if defined(CONFIG_AVM_SIMPLE_PROFILING)
+                avm_simple_profiling_log(avm_profile_data_type_timer_begin, (unsigned int)fn, (unsigned int)data);
+#endif /*--- #if defined(CONFIG_AVM_SIMPLE_PROFILING) ---*/
 				fn(data);
+#if defined(CONFIG_AVM_SIMPLE_PROFILING)
+                avm_simple_profiling_log(avm_profile_data_type_timer_end, (unsigned int)fn, (unsigned int)data);
+#endif /*--- #if defined(CONFIG_AVM_SIMPLE_PROFILING) ---*/
 				if (preempt_count != preempt_count()) {
 					printk(KERN_ERR "huh, entered %p "
 					       "with preempt_count %08x, exited"
@@ -1042,6 +1049,7 @@
 	struct task_struct *p = current;
 	int cpu = smp_processor_id();
 
+    /*--- printk("[ut]"); ---*/
 	/* Note: this timer irq context must be accounted for as well. */
 	account_process_tick(p, user_tick);
 	run_local_timers();