Build breakage from 'ARM: mm: use phys_addr_t appropriately in p2v and v2p conversions'

[Russell King - ARM Linux]

On Mon, Nov 25, 2013 at 10:56:25PM -0500, Nicolas Pitre wrote:
> What about simply doing the following instead, which I'm sure used to 
> work properly at some point:
> 
> diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
> index 9ecccc8650..2b8b8d3236 100644
> --- a/arch/arm/include/asm/memory.h
> +++ b/arch/arm/include/asm/memory.h
> @@ -239,6 +239,14 @@ static inline unsigned long __phys_to_virt(phys_addr_t x)
>  
>  #else
>  
> +#ifndef PHYS_OFFSET
> +#ifdef PLAT_PHYS_OFFSET
> +#define PHYS_OFFSET	PLAT_PHYS_OFFSET
> +#else
> +#define PHYS_OFFSET	UL(CONFIG_PHYS_OFFSET)
> +#endif
> +#endif
> +
>  static inline phys_addr_t __virt_to_phys(unsigned long x)
>  {
>  	return (phys_addr_t)x - PAGE_OFFSET + PHYS_OFFSET;
> @@ -253,14 +261,6 @@ static inline unsigned long __phys_to_virt(phys_addr_t x)
>  #endif
>  #endif /* __ASSEMBLY__ */
>  
> -#ifndef PHYS_OFFSET
> -#ifdef PLAT_PHYS_OFFSET
> -#define PHYS_OFFSET	PLAT_PHYS_OFFSET
> -#else
> -#define PHYS_OFFSET	UL(CONFIG_PHYS_OFFSET)
> -#endif
> -#endif

And that makes PHYS_OFFSET undefined to assembly code - and we have
references to it from said code.