ARM: 7512/1: Fix XIP build due to PHYS_OFFSET definition moving
authorStephen Boyd <sboyd@codeaurora.org>
Tue, 4 Sep 2012 19:04:35 +0000 (20:04 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 7 Sep 2012 19:36:04 +0000 (20:36 +0100)
commitb4ad51559c2f12c34a0340b26ffb02e4b285bc51
treeba5f01e0e636eb29aa2a22a5cf29c5bcd0680ee3
parent36418c516b31bff4ff949c7c618430a1a514debe
ARM: 7512/1: Fix XIP build due to PHYS_OFFSET definition moving

During the p2v changes, the PHYS_OFFSET #define moved into a
!__ASSEMBLY__ section. This causes a XIP build to fail with

 arch/arm/kernel/head.o: In function 'stext':
 arch/arm/kernel/head.S:146: undefined reference to 'PHYS_OFFSET'

Momentarily leave the #ifndef __ASSEMBLY__ section so we can
define PHYS_OFFSET for all compilation units.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/include/asm/memory.h