| Message ID | 1372067284-13389-1-git-send-email-steve.capper@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Monday 24 June 2013, Steve Capper wrote: > For LPAE, do_sect_fault used to be invoked as the second level access > flag handler. When transparent huge pages were introduced for LPAE, > do_page_fault was used instead. > > Unfortunately, do_sect_fault remains defined but not used for LPAE code > resulting in a compile warning. > > This patch surrounds do_sect_fault with #ifndef CONFIG_ARM_LPAE to fix > this warning. > > Signed-off-by: Steve Capper <steve.capper@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
On Mon, Jun 24, 2013 at 10:58:29PM +0200, Arnd Bergmann wrote: > On Monday 24 June 2013, Steve Capper wrote: > > For LPAE, do_sect_fault used to be invoked as the second level access > > flag handler. When transparent huge pages were introduced for LPAE, > > do_page_fault was used instead. > > > > Unfortunately, do_sect_fault remains defined but not used for LPAE code > > resulting in a compile warning. > > > > This patch surrounds do_sect_fault with #ifndef CONFIG_ARM_LPAE to fix > > this warning. > > > > Signed-off-by: Steve Capper <steve.capper@linaro.org> > > Acked-by: Arnd Bergmann <arnd@arndb.de> Thanks Arnd, This is in Russell's system as 7775/1. Cheers,
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 5dbf13f..c97f794 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -491,12 +491,14 @@ do_translation_fault(unsigned long addr, unsigned int fsr, * Some section permission faults need to be handled gracefully. * They can happen due to a __{get,put}_user during an oops. */ +#ifndef CONFIG_ARM_LPAE static int do_sect_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) { do_bad_area(addr, fsr, regs); return 0; } +#endif /* CONFIG_ARM_LPAE */ /* * This abort handler always returns "fault".
For LPAE, do_sect_fault used to be invoked as the second level access flag handler. When transparent huge pages were introduced for LPAE, do_page_fault was used instead. Unfortunately, do_sect_fault remains defined but not used for LPAE code resulting in a compile warning. This patch surrounds do_sect_fault with #ifndef CONFIG_ARM_LPAE to fix this warning. Signed-off-by: Steve Capper <steve.capper@linaro.org> --- arch/arm/mm/fault.c | 2 ++ 1 file changed, 2 insertions(+)