Commit b4ad5155 authored Sep 04, 2012 by Stephen Boyd Committed by Russell King Sep 07, 2012

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>

parent 36418c51

arch/arm/include/asm/memory.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,7 @@ static inline unsigned long __phys_to_virt(unsigned long x)
		#define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET)
		#endif
		#endif
		#endif /* __ASSEMBLY__ */

		#ifndef PHYS_OFFSET
		#ifdef PLAT_PHYS_OFFSET
		@@ -196,6 +197,8 @@ static inline unsigned long __phys_to_virt(unsigned long x)
		#endif
		#endif

		#ifndef __ASSEMBLY__

		/*
		* PFNs are used to describe any physical page; this means
		* PFN 0 == physical address 0.