From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Nov 2015 19:42:25 +0000 (-0800)
Subject: Merge tag 'for-linus-4.4-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~637
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=4fe5e199ebcd82a05c7446e7e6b85027358dc274;p=firefly-linux-kernel-4.4.55.git

Merge tag 'for-linus-4.4-rc2-tag' of git://git./linux/kernel/git/xen/tip

Pull xen bug fixes from David Vrabel:

 - Fix gntdev and numa balancing.

 - Fix x86 boot crash due to unallocated legacy irq descs.

 - Fix overflow in evtchn device when > 1024 event channels.

* tag 'for-linus-4.4-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/evtchn: dynamically grow pending event channel ring
  xen/events: Always allocate legacy interrupts on PV guests
  xen/gntdev: Grant maps should not be subject to NUMA balancing
---

4fe5e199ebcd82a05c7446e7e6b85027358dc274
diff --cc arch/arm64/include/asm/irq.h
index 23eb450b820b,8b9bf54105b3..8e8d30684392
--- a/arch/arm64/include/asm/irq.h
+++ b/arch/arm64/include/asm/irq.h
@@@ -5,6 -7,23 +5,11 @@@
  
  struct pt_regs;
  
 -extern void migrate_irqs(void);
  extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));
  
 -static inline void acpi_irq_init(void)
 -{
 -	/*
 -	 * Hardcode ACPI IRQ chip initialization to GICv2 for now.
 -	 * Proper irqchip infrastructure will be implemented along with
 -	 * incoming  GICv2m|GICv3|ITS bits.
 -	 */
 -	acpi_gic_init();
 -}
 -#define acpi_irq_init acpi_irq_init
 -
+ static inline int nr_legacy_irqs(void)
+ {
+ 	return 0;
+ }
+ 
  #endif