summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/kvmclock.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2008-11-22 18:37:44 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-30 19:03:37 +0100
commit23a14b9e9db49ed5f7683857557c26c874d4abb6 (patch)
tree5ff399b76fc2d31ce3111deef7aec73a40db9672 /arch/x86/kernel/kvmclock.c
parentenable_IR_x2apic() needs to be __init (diff)
downloadlinux-23a14b9e9db49ed5f7683857557c26c874d4abb6.tar.xz
linux-23a14b9e9db49ed5f7683857557c26c874d4abb6.zip
kvm_setup_secondary_clock() is cpuinit
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/kernel/kvmclock.c')
-rw-r--r--arch/x86/kernel/kvmclock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 1c9cc431ea4f..e169ae9b6a62 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/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,