Skip to contentSkip to conversation

ARM: mm: Remove do_sect_fault from LPAE code

PATCH New Steve Capper 2 participants 3 messages Jun 24, 2013 – Jun 25, 2013 Arm (32-bit)

lore
Share & tools
lore

Steve Capper

author
#0 lore raw

PATCH 1/1 ARM: mm: Remove do_sect_fault from LPAE code

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 <[email protected]>
---
 arch/arm/mm/fault.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mm/fault.c +2 -0
index 5dbf13f..c97f794 100644
@@ -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".
Signature · 1 line
1.8.1.4
#1 lore raw

PATCH 1/1 ARM: mm: Remove do_sect_fault from LPAE code

Quoted 11 lines · Steve Capper

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 <[email protected]>
Acked-by Arnd Bergmann <[email protected]>
author
#2 lore raw

PATCH 1/1 ARM: mm: Remove do_sect_fault from LPAE code

Quoted 8 lines · Arnd Bergmann
Quoted 7 lines · Steve Capper

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.

Quoted 6 lines
Quoted 4 lines

This patch surrounds do_sect_fault with #ifndef CONFIG_ARM_LPAE to fix this warning.

Signed-off-by Steve Capper <[email protected]>
Acked-by Arnd Bergmann <[email protected]>

Thanks Arnd,
This is in Russell's system as 7775/1.

Cheers,

Signature · 1 line
Steve