diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 10:47:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 10:47:45 -0700 |
| commit | 08815bc267291ea0a4f7f348290efc555444d7a8 (patch) | |
| tree | 2e6358cd8b69ea5260c0d112684722aca9d7e13b /arch/x86/kvm | |
| parent | 67b1f348c95e48aa80a58fbdca93a702b5afa69c (diff) | |
| parent | 4b8073e467e6a66b6a5a8e799d28bc3b243c0d78 (diff) | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/cleanups from Ingo Molnar:
"Smaller cleanups"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
arch/x86: Remove unecessary semicolons
x86, boot: Remove obsolete and unused constant RAMDISK
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index b1eb202ee76..b06737d122f 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -4543,7 +4543,7 @@ static int handle_cr(struct kvm_vcpu *vcpu) vcpu->run->exit_reason = KVM_EXIT_SET_TPR; return 0; } - }; + } break; case 2: /* clts */ handle_clts(vcpu); |