From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 29 Mar 2016 14:55:42 +0000 (-0400)
Subject: Merge branch 'linux-4.1/4.4-xen-backport' of git://ca-git.us.oracle.com/linux-joaomar... 
X-Git-Tag: v4.1.12-92~172^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ba26c93e3858b354a544e1013bc64b526d9cdddc;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'linux-4.1/4.4-xen-backport' of git://ca-git.us.oracle.com/linux-joaomart-public into uek4/4.4-xen-backport

* 'linux-4.1/4.4-xen-backport' of git://ca-git.us.oracle.com/linux-joaomart-public: (113 commits)
  arch/x86/xen/suspend.c: include xen/xen.h
  x86/paravirt: Prevent rtc_cmos platform device init on PV guests
  xen-pciback: fix up cleanup path when alloc fails
  xen/pciback: Don't allow MSI-X ops if PCI_COMMAND_MEMORY is not set.
  xen/pciback: For XEN_PCI_OP_disable_msi[|x] only disable if device has MSI(X) enabled.
  xen/pciback: Do not install an IRQ handler for MSI interrupts.
  xen/pciback: Return error on XEN_PCI_OP_enable_msix when device has MSI or MSI-X enabled
  xen/pciback: Return error on XEN_PCI_OP_enable_msi when device has MSI or MSI-X enabled
  xen/pciback: Save xen_pci_op commands before processing it
  xen-scsiback: safely copy requests
  xen-blkback: read from indirect descriptors only once
  xen-blkback: only read request operation from shared ring once
  xen-netback: use RING_COPY_REQUEST() throughout
  xen-netback: don't use last request to determine minimum Tx credit
  xen: Add RING_COPY_REQUEST()
  xen/x86/pvh: Use HVM's flush_tlb_others op
  xen: Resume PMU from non-atomic context
  xen/events/fifo: Consume unprocessed events when a CPU dies
  xen/evtchn: dynamically grow pending event channel ring
  xen/gntdev: Grant maps should not be subject to NUMA balancing
  ...

Backport from Linux v4.4

OraBug: 23017418 - Backport Linux v4.4 Xen patches

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

ba26c93e3858b354a544e1013bc64b526d9cdddc
diff --cc arch/x86/include/asm/xen/hypervisor.h
index daa7779beb4d,8b2d4bea9962..0c47f1afb3a0
--- a/arch/x86/include/asm/xen/hypervisor.h
+++ b/arch/x86/include/asm/xen/hypervisor.h
@@@ -57,6 -57,9 +57,11 @@@ static inline bool xen_x2apic_para_avai
  }
  #endif
  
 +void xen_set_iopl_mask(unsigned mask);
 +
+ #ifdef CONFIG_HOTPLUG_CPU
+ void xen_arch_register_cpu(int num);
+ void xen_arch_unregister_cpu(int num);
+ #endif
+ 
  #endif /* _ASM_X86_XEN_HYPERVISOR_H */
diff --cc arch/x86/xen/p2m.c
index 788d68f29468,66f04082b108..deee550060c4
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@@ -539,6 -539,9 +539,8 @@@ int xen_alloc_p2m_entry(unsigned long p
  	unsigned long addr = (unsigned long)(xen_p2m_addr + pfn);
  	unsigned long p2m_pfn;
  
+ 	if (xen_feature(XENFEAT_auto_translated_physmap))
+ 		return 0;
 -
  	ptep = lookup_address(addr, &level);
  	BUG_ON(!ptep || level != PG_LEVEL_4K);
  	pte_pg = (pte_t *)((unsigned long)ptep & ~(PAGE_SIZE - 1));