diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-10 21:53:14 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-10 21:53:14 +0400 |
| commit | 7908a9e5fc3f9a679b1777ed231a03636c068446 (patch) | |
| tree | 8d11c58a2b2550095f0945547e520062466b69f0 /arch/powerpc | |
| parent | 8fade6aff706b2ae3f02864b4023d34b002cd226 (diff) | |
| parent | 07dc7263b99e4ddad2b4c69765a428ccb7d48938 (diff) | |
| download | linux-7908a9e5fc3f9a679b1777ed231a03636c068446.tar.xz | |
Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: read apic->irr with ioapic lock held
KVM: ia64: Add missing spin_unlock in kvm_arch_hardware_enable()
KVM: Fix order passed to iommu_unmap
KVM: MMU: Remove user access when allowing kernel access to gpte.w=0 page
KVM: MMU: invalidate and flush on spte small->large page size change
KVM: SVM: Implement workaround for Erratum 383
KVM: SVM: Handle MCEs early in the vmexit process
KVM: powerpc: fix init/exit annotation
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kvm/e500.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c index bc2b4004eb26..e8a00b0c4449 100644 --- a/arch/powerpc/kvm/e500.c +++ b/arch/powerpc/kvm/e500.c @@ -164,7 +164,7 @@ static int __init kvmppc_e500_init(void) return kvm_init(NULL, sizeof(struct kvmppc_vcpu_e500), 0, THIS_MODULE); } -static void __init kvmppc_e500_exit(void) +static void __exit kvmppc_e500_exit(void) { kvmppc_booke_exit(); } |