Merge "Revert "ARM: gic: Remove ARCH_MSM8625 around the gic_save APIs"" (11d9a4d6) · Commits · e / devices / android_kernel_sony_msm8994

drivers/irqchip/irq-gic.c

+1 −17

Original line number	Diff line number	Diff line
		@@ -859,22 +859,6 @@ static void __init gic_pm_init(struct gic_chip_data *gic)
		static void __init gic_pm_init(struct gic_chip_data *gic)
		{
		}

		static void gic_cpu_restore(unsigned int gic_nr)
		{
		}

		static void gic_cpu_save(unsigned int gic_nr)
		{
		}

		static void gic_dist_restore(unsigned int gic_nr)
		{
		}

		static void gic_dist_save(unsigned int gic_nr)
		{
		}
		#endif

		#ifdef CONFIG_SMP
		@@ -1227,7 +1211,6 @@ unsigned int msm_gic_spi_ppi_pending(void)

		return 0;
		}
		#endif

		void msm_gic_save(bool modem_wake, int from_idle)
		{
		@@ -1287,3 +1270,4 @@ void gic_configure_and_raise(unsigned int irq, unsigned int cpu)

		raw_spin_unlock_irqrestore(&irq_controller_lock, flags);
		}
		#endif

+2 −1

Original line number	Diff line number	Diff line
		@@ -79,9 +79,10 @@ static inline void gic_init(unsigned int nr, int start,
		gic_init_bases(nr, start, dist, cpu, 0, NULL);
		}

		#ifdef CONFIG_ARCH_MSM8625
		void msm_gic_save(bool modem_wake, int from_idle);
		void msm_gic_restore(void);
		void gic_configure_and_raise(unsigned int irq, unsigned int cpu);
		#endif

		#endif
		#endif