diff options
| author | Linus Torvalds | 2008-11-12 19:38:42 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2008-11-12 19:38:42 +0100 |
| commit | 5d2007ebc278525cbe8d2e3ef559a4b191ee4ded (patch) | |
| tree | 04287151da2ecbd8055703d34b0b572709651137 /arch/x86/kernel | |
| parent | parisc: fix find_extend_vma() breakage (diff) | |
| parent | KVM: Fix pit memory leak if unable to allocate irq source id (diff) | |
| download | kernel-qcow2-linux-5d2007ebc278525cbe8d2e3ef559a4b191ee4ded.tar.gz kernel-qcow2-linux-5d2007ebc278525cbe8d2e3ef559a4b191ee4ded.tar.xz kernel-qcow2-linux-5d2007ebc278525cbe8d2e3ef559a4b191ee4ded.zip | |
Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
KVM: Fix pit memory leak if unable to allocate irq source id
KVM: ia64: fix vmm_spin_{un}lock for !CONFIG_SMP
KVM: VMX: Set IGMT bit in EPT entry
KVM: Require the PCI subsystem
x86: KVM guest: fix section mismatch warning in kvmclock.c
KVM: ia64: Use guest signal mask when blocking
KVM: MMU: increase per-vcpu rmap cache alloc size
Diffstat (limited to 'arch/x86/kernel')
| -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 774ac4991568..1c9cc431ea4f 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 kvm_setup_secondary_clock(void) +static void __devinit kvm_setup_secondary_clock(void) { /* * Now that the first cpu already had this clocksource initialized, |