lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 17 Nov 2014 12:48:25 +0100 From: Marek Szyprowski <m.szyprowski@...sung.com> To: linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org Cc: Marek Szyprowski <m.szyprowski@...sung.com>, Tomasz Figa <tomasz.figa@...il.com>, Kyungmin Park <kyungmin.park@...sung.com>, linux-samsung-soc@...r.kernel.org, Arnd Bergmann <arnd@...db.de>, Olof Johansson <olof@...om.net>, Russell King - ARM Linux <linux@....linux.org.uk>, Kukjin Kim <kgene.kim@...sung.com>, lauraa@...eaurora.org, linux-omap@...r.kernel.org, linus.walleij@...aro.org, tony@...mide.com, drake@...lessm.com, loeliger@...il.com, Mark Rutland <mark.rutland@....com> Subject: [PATCH v9 3/7] ARM: l2c: Get outer cache .write_sec callback from mach_desc only if not NULL From: Tomasz Figa <t.figa@...sung.com> 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 <t.figa@...sung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@...sung.com> --- 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 7c81ec428b9b..5acb8aef6f2d 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -108,7 +108,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-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists