* Marek Szyprowski <[email protected]> [150105 04:22]: > From: Tomasz Figa <[email protected]> > > Certain platforms (i.e. Exynos) might need to set .write_sec callback > from firmware initialization which is happenning in .init_early callback > of machine descriptor. However current code will overwrite the pointer > with whatever is present in machine descriptor, even though it can be > already set earlier. This patch fixes this by making the assignment > conditional, depending on whether current .write_sec callback is NULL. > > Signed-off-by: Tomasz Figa <[email protected]> > Signed-off-by: Marek Szyprowski <[email protected]>
Acked-by: Tony Lindgren <[email protected]> > --- > arch/arm/kernel/irq.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c > index ad857bada96c..350f188c92d2 100644 > --- a/arch/arm/kernel/irq.c > +++ b/arch/arm/kernel/irq.c > @@ -109,7 +109,8 @@ void __init init_IRQ(void) > > if (IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_CACHE_L2X0) && > (machine_desc->l2c_aux_mask || machine_desc->l2c_aux_val)) { > - outer_cache.write_sec = machine_desc->l2c_write_sec; > + if (!outer_cache.write_sec) > + outer_cache.write_sec = machine_desc->l2c_write_sec; > ret = l2x0_of_init(machine_desc->l2c_aux_val, > machine_desc->l2c_aux_mask); > if (ret) > -- > 1.9.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
