---

yaml --- r: 119323 b: refs/heads/master c: 23a14b9 h: refs/heads/master i: 119321: e55dade 119319: 833f01f v: v3
git-mirror · Nov 30, 2008 · b18c0d7 · b18c0d7
1 parent ef861ef
commit b18c0d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2236d252e001ea57d53cec1954f680e503f3b8bc
+refs/heads/master: 23a14b9e9db49ed5f7683857557c26c874d4abb6
diff --git a/trunk/arch/x86/kernel/kvmclock.c b/trunk/arch/x86/kernel/kvmclock.c
@@ -128,7 +128,7 @@ static int kvm_register_clock(char *txt)
 }
 
 #ifdef CONFIG_X86_LOCAL_APIC
-static void __devinit kvm_setup_secondary_clock(void)
+static void __cpuinit kvm_setup_secondary_clock(void)
 {
 	/*
 	 * Now that the first cpu already had this clocksource initialized,