From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Dec 2014 21:23:03 +0000 (-0800)
Subject: Merge tag 'stable/for-linus-3.19-rc0b-tag' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v3.19-rc1~62
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=eb64c3c6cdb8fa8a4d324eb71a9033b62e150918;p=linux.git

Merge tag 'stable/for-linus-3.19-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull additional xen update from David Vrabel:
 "Xen: additional features for 3.19-rc0

   - Linear p2m for x86 PV guests which simplifies the p2m code,
     improves performance and will allow for > 512 GB PV guests in the
     future.

  A last-minute, configuration specific issue was discovered with this
  change which is why it was not included in my previous pull request.
  This is now been fixed and tested"

* tag 'stable/for-linus-3.19-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: switch to post-init routines in xen mmu.c earlier
  Revert "swiotlb-xen: pass dev_addr to swiotlb_tbl_unmap_single"
  xen: annotate xen_set_identity_and_remap_chunk() with __init
  xen: introduce helper functions to do safe read and write accesses
  xen: Speed up set_phys_to_machine() by using read-only mappings
  xen: switch to linear virtual mapped sparse p2m list
  xen: Hide get_phys_to_machine() to be able to tune common path
  x86: Introduce function to get pmd entry pointer
  xen: Delay invalidating extra memory
  xen: Delay m2p_override initialization
  xen: Delay remapping memory of pv-domain
  xen: use common page allocation function in p2m.c
  xen: Make functions static
  xen: fix some style issues in p2m.c
---

eb64c3c6cdb8fa8a4d324eb71a9033b62e150918
diff --cc arch/x86/xen/xen-ops.h
index 4ab9298c5e17,f92921fa54f9..5686bd9d58cc
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@@ -32,8 -32,11 +32,10 @@@ void xen_reserve_top(void)
  
  void xen_mm_pin_all(void);
  void xen_mm_unpin_all(void);
 -void xen_set_pat(u64);
  
+ unsigned long __ref xen_chk_extra_mem(unsigned long pfn);
+ void __init xen_inv_extra_mem(void);
+ void __init xen_remap_memory(void);
  char * __init xen_memory_setup(void);
  char * xen_auto_xlated_memory_setup(void);
  void __init xen_arch_setup(void);