diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-04-19 13:03:08 +0200 | 
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-19 13:03:08 +0200 | 
| commit | 5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e (patch) | |
| tree | 524d8ac34cc8c7ef68b43e3ee6e08e27db86299c /include/linux/kvm_host.h | |
| parent | b6d5278dc8385eaf2e3904a4af444a04f6ae4e71 (diff) | |
| parent | 94c1acf2c85b03a59a42d931a94a13a76c123a62 (diff) | |
| download | olio-linux-3.10-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.tar.xz olio-linux-3.10-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.zip  | |
Merge tag 'edac_amd_f16h' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull AMD F16h support for amd64_edac from Borislav Petkov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/kvm_host.h')
| -rw-r--r-- | include/linux/kvm_host.h | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index cad77fe09d7..c1395825192 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -518,7 +518,7 @@ int kvm_write_guest(struct kvm *kvm, gpa_t gpa, const void *data,  int kvm_write_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,  			   void *data, unsigned long len);  int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc, -			      gpa_t gpa); +			      gpa_t gpa, unsigned long len);  int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len);  int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len);  struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn);  |