From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Oct 2012 16:30:33 +0000 (-0700)
Subject: Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ecefbd94b834fa32559d854646d777c56749ef1c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'kvm-3.7-1' of git://git./virt/kvm/kvm

Pull KVM updates from Avi Kivity:
 "Highlights of the changes for this release include support for vfio
  level triggered interrupts, improved big real mode support on older
  Intels, a streamlines guest page table walker, guest APIC speedups,
  PIO optimizations, better overcommit handling, and read-only memory."

* tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (138 commits)
  KVM: s390: Fix vcpu_load handling in interrupt code
  KVM: x86: Fix guest debug across vcpu INIT reset
  KVM: Add resampling irqfds for level triggered interrupts
  KVM: optimize apic interrupt delivery
  KVM: MMU: Eliminate pointless temporary 'ac'
  KVM: MMU: Avoid access/dirty update loop if all is well
  KVM: MMU: Eliminate eperm temporary
  KVM: MMU: Optimize is_last_gpte()
  KVM: MMU: Simplify walk_addr_generic() loop
  KVM: MMU: Optimize pte permission checks
  KVM: MMU: Update accessed and dirty bits after guest pagetable walk
  KVM: MMU: Move gpte_access() out of paging_tmpl.h
  KVM: MMU: Optimize gpte_access() slightly
  KVM: MMU: Push clean gpte write protection out of gpte_access()
  KVM: clarify kvmclock documentation
  KVM: make processes waiting on vcpu mutex killable
  KVM: SVM: Make use of asm.h
  KVM: VMX: Make use of asm.h
  KVM: VMX: Make lto-friendly
  KVM: x86: lapic: Clean up find_highest_vector() and count_vectors()
  ...

Conflicts:
	arch/s390/include/asm/processor.h
	arch/x86/kvm/i8259.c
---

ecefbd94b834fa32559d854646d777c56749ef1c
diff --cc arch/s390/include/asm/processor.h
index f3e0aabfc6bc,eac4fb5fb826..56831dfa9198
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@@ -158,7 -140,7 +158,8 @@@ extern int kernel_thread(int (*fn)(voi
  extern unsigned long thread_saved_pc(struct task_struct *t);
  
  extern void show_code(struct pt_regs *regs);
 +extern void print_fn_code(unsigned char *code, unsigned long len);
+ extern int insn_to_mnemonic(unsigned char *instruction, char buf[8]);
  
  unsigned long get_wchan(struct task_struct *p);
  #define task_pt_regs(tsk) ((struct pt_regs *) \
diff --cc virt/kvm/eventfd.c
index 67a35e90384c,356965c9d107..9718e98d6d2a
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@@ -90,8 -171,13 +171,13 @@@ irqfd_shutdown(struct work_struct *work
  	 * We know no new events will be scheduled at this point, so block
  	 * until all previously outstanding events have completed
  	 */
 -	flush_work_sync(&irqfd->inject);
 +	flush_work(&irqfd->inject);
  
+ 	if (irqfd->resampler) {
+ 		irqfd_resampler_shutdown(irqfd);
+ 		eventfd_ctx_put(irqfd->resamplefd);
+ 	}
+ 
  	/*
  	 * It is now safe to release the object's resources
  	 */