Merge tag 'for-linus-4.2-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull xen bug fixes from David Vrabel:

 - revert a fix from 4.2-rc5 that was causing lots of WARNING spam.

 - fix a memory leak affecting backends in HVM guests.

 - fix PV domU hang with certain configurations.

* tag 'for-linus-4.2-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/xenbus: Don't leak memory when unmapping the ring on HVM backend
  Revert "xen/events/fifo: Handle linked events when closing a port"
  x86/xen: build "Xen PV" APIC driver for domU as well

diff --combined arch/x86/xen/xen-ops.h
index c20fe29e65f48b4706789e0ad59bb33b1a3acc18,bef30cbb56c4775e6ae1faad32d63becbd8699ce..2292721b1d103844ade9f8a7f436a649c811f77d
--- 1/arch/x86/xen/xen-ops.h
--- 2/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@@ -101,17 -101,15 +101,15 @@@ struct dom0_vga_console_info
  
  #ifdef CONFIG_XEN_DOM0
  void __init xen_init_vga(const struct dom0_vga_console_info *, size_t size);
- void __init xen_init_apic(void);
  #else
  static inline void __init xen_init_vga(const struct dom0_vga_console_info *info,
                                       size_t size)
  {
  }
- static inline void __init xen_init_apic(void)
- {
- }
  #endif
  
+ void __init xen_init_apic(void);
+ 
  #ifdef CONFIG_XEN_EFI
  extern void xen_efi_init(void);
  #else
@@@ -134,9 -132,7 +132,9 @@@ DECL_ASM(void, xen_restore_fl_direct, u
  
  /* These are not functions, and cannot be called normally */
  __visible void xen_iret(void);
 +#ifdef CONFIG_X86_32
  __visible void xen_sysexit(void);
 +#endif
  __visible void xen_sysret32(void);
  __visible void xen_sysret64(void);
  __visible void xen_adjust_exception_frame(void);