| Message ID | 1343956994-27513-1-git-send-email-sboyd@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 8/2/2012 6:23 PM, Stephen Boyd wrote: > 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> > --- > > I don't know if it's worth stable, seems that nobody has compiled XIP for > a year (back to 2.6.39 days?). Is this approach acceptable? Shall I put this in the patch tracker?
On 08/09/12 23:46, Stephen Boyd wrote: > On 8/2/2012 6:23 PM, Stephen Boyd wrote: >> 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> >> --- >> >> I don't know if it's worth stable, seems that nobody has compiled XIP for >> a year (back to 2.6.39 days?). > Is this approach acceptable? Shall I put this in the patch tracker? > I'll take silence to mean "yes", so I'll put this in the patch tracker unless someone objects.
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index fcb5757..3299b2d 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -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.
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> --- I don't know if it's worth stable, seems that nobody has compiled XIP for a year (back to 2.6.39 days?). arch/arm/include/asm/memory.h | 3 +++ 1 file changed, 3 insertions(+)