--- zzzz-none-000/linux-2.6.19.2/arch/i386/kernel/time.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5504/linux-2.6.19.2/arch/i386/kernel/time.c	2007-01-19 14:42:56.000000000 +0000
@@ -133,7 +133,7 @@
 	unsigned long pc = instruction_pointer(regs);
 
 #ifdef CONFIG_SMP
-	if (!user_mode_vm(regs) && in_lock_functions(pc)) {
+	if (!user_mode(regs) && in_lock_functions(pc)) {
 #ifdef CONFIG_FRAME_POINTER
 		return *(unsigned long *)(regs->ebp + 4);
 #else
@@ -345,7 +345,7 @@
 	.cls	= &timer_sysclass,
 };
 
-static int time_init_device(void)
+static int __init time_init_device(void)
 {
 	int error = sysdev_class_register(&timer_sysclass);
 	if (!error)