Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0d7c3d4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "ARM: gic: Remove parameters from msm_gic_save""

parents 5fdef446 1f4bb668

arch/arm/mach-msm/mpm-8625.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -251,7 +251,7 @@ int msm_gic_irq_enter_sleep2(bool modem_wake, int from_idle) 
		/* save the contents of GIC CPU interface and Distributor

		 * Disable all the Interrupts, if we enter from idle pc

		 */

		msm_gic_save();

		msm_gic_save(modem_wake, from_idle);

		irq_set_irq_type(MSM8625_INT_A9_M2A_6, IRQF_TRIGGER_RISING);

		enable_irq(MSM8625_INT_A9_M2A_6);

		pr_debug("%s going for sleep now\n", __func__);

drivers/irqchip/irq-gic.c

+1 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ unsigned int msm_gic_spi_ppi_pending(void) 
}

#endif



void msm_gic_save(void)

void msm_gic_save(bool modem_wake, int from_idle)

{

	unsigned int i;

	struct gic_chip_data *gic = &gic_data[0];

include/linux/irqchip/arm-gic.h

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

}



void msm_gic_save(void);

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