ARM: 8261/1: l2c: Get outer cache .write_sec callback from mach_desc only if not...
authorTomasz Figa <t.figa@samsung.com>
Thu, 8 Jan 2015 06:51:45 +0000 (07:51 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 16 Jan 2015 14:35:33 +0000 (14:35 +0000)
commit0c4c2edcaeee323fcc4f41a862456358eda50b57
tree2e1db1604b2821b3aa7f335ed0a181f597c37188
parentc6d1a2d0078a30eb6290428a858c4e790a0e8691
ARM: 8261/1: l2c: Get outer cache .write_sec callback from mach_desc only if not NULL

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@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Nishanth Menon <nm@ti.com>
Acked-by: Nishanth Menon <nm@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/irq.c