--- zzzz-none-000/linux-2.6.32.61/kernel/timer.c	2013-06-10 09:43:48.000000000 +0000
+++ ar9-7330-650/linux-2.6.32.61/kernel/timer.c	2014-06-10 14:33:12.000000000 +0000
@@ -39,6 +39,9 @@
 #include <linux/kallsyms.h>
 #include <linux/perf_event.h>
 #include <linux/sched.h>
+#if defined(CONFIG_AVM_SIMPLE_PROFILING)
+#include <linux/avm_profile.h>
+#endif /*--- #if defined(CONFIG_AVM_SIMPLE_PROFILING) ---*/
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -63,6 +66,10 @@
 #define TVN_MASK (TVN_SIZE - 1)
 #define TVR_MASK (TVR_SIZE - 1)
 
+#if defined(CONFIG_CHECK_TIMER_ON_FREED_MODULE)
+extern int module_alloc_check_pointer(unsigned long addr, char **name) __attribute__ ((weak));
+#endif
+
 struct tvec {
 	struct list_head vec[TVN_SIZE];
 };
@@ -1023,7 +1030,25 @@
 				lock_map_acquire(&lockdep_map);
 
 				trace_timer_expire_entry(timer);
+#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) ---*/
+		
+#if defined(CONFIG_CHECK_TIMER_ON_FREED_MODULE)
+                if(!IS_ERR(module_alloc_check_pointer)) {
+                    char *name;
+                    int ret = module_alloc_check_pointer((unsigned long)fn, &name);
+                    if(ret == -1) {
+                        panic("TIMER: call pointer from freed module '%s' \n", name ? name: "unbekannt");
+                    }
+                }
+#endif /*--- #if defined(CONFIG_CHECK_TIMER_ON_FREED_MODULE) ---*/
+
 				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) ---*/
+
 				trace_timer_expire_exit(timer);
 
 				lock_map_release(&lockdep_map);
@@ -1325,7 +1350,7 @@
 
 #endif
 
-static void process_timeout(unsigned long __data)
+static inline void process_timeout(unsigned long __data)
 {
 	wake_up_process((struct task_struct *)__data);
 }