]> Pileus Git - ~andy/linux/commitdiff
ARM: 7775/1: mm: Remove do_sect_fault from LPAE code
authorSteven Capper <steve.capper@linaro.org>
Tue, 25 Jun 2013 07:45:51 +0000 (08:45 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 29 Jun 2013 10:23:23 +0000 (11:23 +0100)
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>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mm/fault.c

index 5dbf13f954f6f493aaae525d4f3b93282ac88f75..c97f7940cb9553d52ba3b6c711f2dab430aea110 100644 (file)
@@ -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".