Darkangeel_hd
/
lineage_android_kernel_samsung_jf
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_samsung_jf.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge "ARM: gic: Remove ARCH_MSM8625 around the gic_save APIs" into msm-3.4

This commit is contained in:
Linux Build Service Account 2012-06-29 12:15:28 -07:00 committed by QuIC Gerrit Code Review
parent 00d185c94d 3850105a22
commit d8d697b69d
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/common/gic.c
View File

@ -811,6 +811,22 @@ static void __init gic_pm_init(struct gic_chip_data *gic)
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 #endif
static int gic_irq_domain_map(struct irq_domain *d, unsigned int irq, static int gic_irq_domain_map(struct irq_domain *d, unsigned int irq,
@ -1133,6 +1149,7 @@ unsigned int msm_gic_spi_ppi_pending(void)
return 0; return 0;
} }
#endif
void msm_gic_save(bool modem_wake, int from_idle) void msm_gic_save(bool modem_wake, int from_idle)
{ {
@ -1199,4 +1216,3 @@ void core1_gic_configure_and_raise(void)
mb(); mb();
raw_spin_unlock_irqrestore(&irq_controller_lock, flags); raw_spin_unlock_irqrestore(&irq_controller_lock, flags);
} }
#endif

2
arch/arm/include/asm/hardware/gic.h
View File

@ -59,9 +59,7 @@ static inline void gic_init(unsigned int nr, int start,
gic_init_bases(nr, start, dist, cpu, 0, NULL); gic_init_bases(nr, start, dist, cpu, 0, NULL);
} }
void gic_set_irq_secure(unsigned int irq); void gic_set_irq_secure(unsigned int irq);
#endif
#ifdef CONFIG_ARCH_MSM8625
void msm_gic_save(bool modem_wake, int from_idle); void msm_gic_save(bool modem_wake, int from_idle);
void msm_gic_restore(void); void msm_gic_restore(void);
void core1_gic_configure_and_raise(void); void core1_gic_configure_and_raise(void);