Merge tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kerne...

Pull xen bug fixes from David Vrabel:
 - Fix arm64 crash on boot.
 - Quiet a noisy arm build warning (virt_to_pfn() redefined).

* tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  arm64: introduce virt_to_pfn
  xen/events/fifo: correctly align bitops
  arm/xen: Remove definiition of virt_to_pfn in asm/xen/page.h

diff --combined arch/arm64/include/asm/memory.h
index e94f9458aa6faa3630d5d2b7cebf9e522b56901d,d79a79e7dd04eff1dc9861156436835df263634f..993bce527b8552d379c62b6082703b1438e80436
--- 1/arch/arm64/include/asm/memory.h
--- 2/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@@ -49,7 -49,7 +49,7 @@@
  #define PAGE_OFFSET           (UL(0xffffffffffffffff) << (VA_BITS - 1))
  #define MODULES_END           (PAGE_OFFSET)
  #define MODULES_VADDR         (MODULES_END - SZ_64M)
 -#define EARLYCON_IOBASE               (MODULES_VADDR - SZ_4M)
 +#define FIXADDR_TOP           (MODULES_VADDR - SZ_2M - PAGE_SIZE)
  #define TASK_SIZE_64          (UL(1) << VA_BITS)
  
  #ifdef CONFIG_COMPAT
@@@ -138,6 -138,7 +138,7 @@@ static inline void *phys_to_virt(phys_a
  #define __pa(x)                       __virt_to_phys((unsigned long)(x))
  #define __va(x)                       ((void *)__phys_to_virt((phys_addr_t)(x)))
  #define pfn_to_kaddr(pfn)     __va((pfn) << PAGE_SHIFT)
+ #define virt_to_pfn(x)      __phys_to_pfn(__virt_to_phys(x))
  
  /*
   *  virt_to_page(k)   convert a _valid_ virtual address to struct page *