diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 13:53:55 -0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 13:53:55 -0400 |
| commit | 05e97a9eda72d58dba293857df6aac62584ef99a (patch) | |
| tree | e86e692f26d4879ff2210c54722e2b7780210249 /arch/x86/kvm/svm.c | |
| parent | 2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff) | |
| parent | d4ed3b9015b5eebc90d629579d9e7944607cbae5 (diff) | |
Merge tag 'nand/fixes-for-4.12-rc3' of git://git.infradead.org/linux-mtd into MTD
From Boris:
"""
This pull request contains several fixes to the core and the tango
driver.
tango fixes:
* Add missing MODULE_DEVICE_TABLE() in tango_nand.c
* Update the number of corrected bitflips
core fixes:
* Fix a long standing memory leak in nand_scan_tail()
* Fix several bugs introduced by the per-vendor init/detection
infrastructure (introduced in 4.12)
* Add a static specifier to nand_ooblayout_lp_hamming_ops definition
"""
Diffstat (limited to 'arch/x86/kvm/svm.c')
| -rw-r--r-- | arch/x86/kvm/svm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index c27ac6923a18..183ddb235fb4 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c | |||
| @@ -1272,7 +1272,8 @@ static void init_vmcb(struct vcpu_svm *svm) | |||
| 1272 | 1272 | ||
| 1273 | } | 1273 | } |
| 1274 | 1274 | ||
| 1275 | static u64 *avic_get_physical_id_entry(struct kvm_vcpu *vcpu, int index) | 1275 | static u64 *avic_get_physical_id_entry(struct kvm_vcpu *vcpu, |
| 1276 | unsigned int index) | ||
| 1276 | { | 1277 | { |
| 1277 | u64 *avic_physical_id_table; | 1278 | u64 *avic_physical_id_table; |
| 1278 | struct kvm_arch *vm_data = &vcpu->kvm->arch; | 1279 | struct kvm_arch *vm_data = &vcpu->kvm->arch; |