~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1732,7 +1732,7 @@
1732	1732	return false;
1733	1733	}
1734	1734
1735		-static inline bool ioapic_irqd_mask(struct irq_data *data)
	1735	+static inline bool ioapic_prepare_move(struct irq_data *data)
1736	1736	{
1737	1737	/* If we are moving the IRQ we need to mask it */
1738	1738	if (unlikely(irqd_is_setaffinity_pending(data))) {
..	..	@@ -1743,9 +1743,9 @@
1743	1743	return false;
1744	1744	}
1745	1745
1746		-static inline void ioapic_irqd_unmask(struct irq_data *data, bool masked)
	1746	+static inline void ioapic_finish_move(struct irq_data *data, bool moveit)
1747	1747	{
1748		- if (unlikely(masked)) {
	1748	+ if (unlikely(moveit)) {
1749	1749	/* Only migrate the irq if the ack has been received.
1750	1750	*
1751	1751	* On rare occasions the broadcast level triggered ack gets
..	..	@@ -1780,11 +1780,11 @@
1780	1780	}
1781	1781	}
1782	1782	#else
1783		-static inline bool ioapic_irqd_mask(struct irq_data *data)
	1783	+static inline bool ioapic_prepare_move(struct irq_data *data)
1784	1784	{
1785	1785	return false;
1786	1786	}
1787		-static inline void ioapic_irqd_unmask(struct irq_data *data, bool masked)
	1787	+static inline void ioapic_finish_move(struct irq_data *data, bool moveit)
1788	1788	{
1789	1789	}
1790	1790	#endif
..	..	@@ -1793,11 +1793,11 @@
1793	1793	{
1794	1794	struct irq_cfg *cfg = irqd_cfg(irq_data);
1795	1795	unsigned long v;
1796		- bool masked;
	1796	+ bool moveit;
1797	1797	int i;
1798	1798
1799	1799	irq_complete_move(cfg);
1800		- masked = ioapic_irqd_mask(irq_data);
	1800	+ moveit = ioapic_prepare_move(irq_data);
1801	1801
1802	1802	/*
1803	1803	* It appears there is an erratum which affects at least version 0x11
..	..	@@ -1852,7 +1852,7 @@
1852	1852	eoi_ioapic_pin(cfg->vector, irq_data->chip_data);
1853	1853	}
1854	1854
1855		- ioapic_irqd_unmask(irq_data, masked);
	1855	+ ioapic_finish_move(irq_data, moveit);
1856	1856	}
1857	1857
1858	1858	static void ioapic_ir_ack_level(struct irq_data *irq_data)