From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Wed, 10 Oct 2012 22:03:54 +0000 (-0300)
Subject: Merge branch 'for-upstream' of http://github.com/agraf/linux-2.6 into queue
X-Git-Tag: v3.8-rc1~121^2~56
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=03604b31142058362db13e7881385806977893f5;p=cascardo%2Flinux.git

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

* 'for-upstream' of http://github.com/agraf/linux-2.6: (56 commits)
  arch/powerpc/kvm/e500_tlb.c: fix error return code
  KVM: PPC: Book3S HV: Provide a way for userspace to get/set per-vCPU areas
  KVM: PPC: Book3S: Get/set guest FP regs using the GET/SET_ONE_REG interface
  KVM: PPC: Book3S: Get/set guest SPRs using the GET/SET_ONE_REG interface
  KVM: PPC: set IN_GUEST_MODE before checking requests
  KVM: PPC: e500: MMU API: fix leak of shared_tlb_pages
  KVM: PPC: e500: fix allocation size error on g2h_tlb1_map
  KVM: PPC: Book3S HV: Fix calculation of guest phys address for MMIO emulation
  KVM: PPC: Book3S HV: Remove bogus update of physical thread IDs
  KVM: PPC: Book3S HV: Fix updates of vcpu->cpu
  KVM: Move some PPC ioctl definitions to the correct place
  KVM: PPC: Book3S HV: Handle memory slot deletion and modification correctly
  KVM: PPC: Move kvm->arch.slot_phys into memslot.arch
  KVM: PPC: Book3S HV: Take the SRCU read lock before looking up memslots
  KVM: PPC: bookehv: Allow duplicate calls of DO_KVM macro
  KVM: PPC: BookE: Support FPU on non-hv systems
  KVM: PPC: 440: Implement mfdcrx
  KVM: PPC: 440: Implement mtdcrx
  Document IACx/DACx registers access using ONE_REG API
  KVM: PPC: E500: Remove E500_TLB_DIRTY flag
  ...
---

03604b31142058362db13e7881385806977893f5
diff --cc arch/powerpc/sysdev/fsl_msi.c
index 51ffafae561e,7e2b2f2e3ecd..63c5f04ea580
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@@ -506,12 -509,14 +509,14 @@@ static const struct of_device_id fsl_of
  	},
  	{
  		.compatible = "fsl,ipic-msi",
 -		.data = (void *)&ipic_msi_feature,
 +		.data = &ipic_msi_feature,
  	},
+ #ifdef CONFIG_EPAPR_PARAVIRT
  	{
  		.compatible = "fsl,vmpic-msi",
 -		.data = (void *)&vmpic_msi_feature,
 +		.data = &vmpic_msi_feature,
  	},
+ #endif
  	{}
  };