diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-05 15:27:43 +1100 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-05 15:27:43 +1100 |
| commit | 14d676f56fad26fd3c31eeff5d4ef8ea4a163571 (patch) | |
| tree | 5e740c5931daecf44a6e74c230f2deb291290f4b /arch/x86/kernel/kvmclock.c | |
| parent | 797eaed40e1df4a3b9ece6894a71ce2b568bca38 (diff) | |
| parent | feaf3848a813a106f163013af6fcf6c4bfec92d9 (diff) | |
| download | blackbird-op-linux-14d676f56fad26fd3c31eeff5d4ef8ea4a163571.tar.gz blackbird-op-linux-14d676f56fad26fd3c31eeff5d4ef8ea4a163571.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/kernel/kvmclock.c')
| -rw-r--r-- | arch/x86/kernel/kvmclock.c | 2 |
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, |
