Merge branch 'for-upstream' of https://github.com/agraf/linux-2.6 into queue

* 'for-upstream' of https://github.com/agraf/linux-2.6: (28 commits)
  KVM: PPC: booke: Get/set guest EPCR register using ONE_REG interface
  KVM: PPC: bookehv: Add EPCR support in mtspr/mfspr emulation
  KVM: PPC: bookehv: Add guest computation mode for irq delivery
  KVM: PPC: Make EPCR a valid field for booke64 and bookehv
  KVM: PPC: booke: Extend MAS2 EPN mask for 64-bit
  KVM: PPC: e500: Mask MAS2 EPN high 32-bits in 32/64 tlbwe emulation
  KVM: PPC: Mask ea's high 32-bits in 32/64 instr emulation
  KVM: PPC: e500: Add emulation helper for getting instruction ea
  KVM: PPC: bookehv64: Add support for interrupt handling
  KVM: PPC: bookehv: Remove GET_VCPU macro from exception handler
  KVM: PPC: booke: Fix get_tb() compile error on 64-bit
  KVM: PPC: e500: Silence bogus GCC warning in tlb code
  KVM: PPC: Book3S HV: Handle guest-caused machine checks on POWER7 without panicking
  KVM: PPC: Book3S HV: Improve handling of local vs. global TLB invalidations
  MAINTAINERS: Add git tree link for PPC KVM
  KVM: PPC: Book3S PR: MSR_DE doesn't exist on Book 3S
  KVM: PPC: Book3S PR: Fix VSX handling
  KVM: PPC: Book3S PR: Emulate PURR, SPURR and DSCR registers
  KVM: PPC: Book3S HV: Don't give the guest RW access to RO pages
  KVM: PPC: Book3S HV: Report correct HPT entry index when reading HPT
  ...

diff --combined include/linux/kvm_host.h
index 36c3704bfa7cd7eaaeb69f9976b3d44baec150b3,c823e47c364152bfb4e67af98222833ca0f244f6..91ae127f4ac57ba5dd08da48095b906f526bad4b
--- 1/include/linux/kvm_host.h
--- 2/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@@ -693,7 -693,6 +693,7 @@@ void kvm_get_intr_delivery_bitmask(stru
                                   unsigned long *deliver_bitmask);
  #endif
  int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level);
 +int kvm_set_irq_inatomic(struct kvm *kvm, int irq_source_id, u32 irq, int level);
  int kvm_set_msi(struct kvm_kernel_irq_routing_entry *irq_entry, struct kvm *kvm,
                int irq_source_id, int level);
  void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin);
@@@ -901,10 -900,20 +901,20 @@@ static inline void kvm_free_irq_routing
  #ifdef CONFIG_HAVE_KVM_EVENTFD
  
  void kvm_eventfd_init(struct kvm *kvm);
+ int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args);
+ 
+ #ifdef CONFIG_HAVE_KVM_IRQCHIP
  int kvm_irqfd(struct kvm *kvm, struct kvm_irqfd *args);
  void kvm_irqfd_release(struct kvm *kvm);
  void kvm_irq_routing_update(struct kvm *, struct kvm_irq_routing_table *);
- int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args);
+ #else
+ static inline int kvm_irqfd(struct kvm *kvm, struct kvm_irqfd *args)
+ {
+       return -EINVAL;
+ }
+ 
+ static inline void kvm_irqfd_release(struct kvm *kvm) {}
+ #endif
  
  #else