From: David Daney <david.daney@xxxxxxxxxx>
In the case of !CONFIG_HUGETLB_PAGE, in linux/hugetlb.h we have this
definition:
#define pmd_huge(x) 0
The other huge page constants in the if(pmd_huge()) block are likewise
defined, so we can get rid of the #ifdef CONFIG_HUGETLB_PAGE an let
the compiler optimize this block away instead. Doing this the code
has a much cleaner appearance.
Signed-off-by: David Daney <david.daney@xxxxxxxxxx>
---
The first attempt as sending the patch resulted in a corrupt change
log, no change other than correcting the log.
arch/mips/mm/tlb-r4k.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index 88dc49c..f93af98 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -305,7 +305,7 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
pudp = pud_offset(pgdp, address);
pmdp = pmd_offset(pudp, address);
idx = read_c0_index();
-#ifdef CONFIG_HUGETLB_PAGE
+
/* this could be a huge page */
if (pmd_huge(*pmdp)) {
unsigned long lo;
@@ -321,9 +321,7 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
else
tlb_write_indexed();
write_c0_pagemask(PM_DEFAULT_MASK);
- } else
-#endif
- {
+ } else {
ptep = pte_offset_map(pmdp, address);
#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32)
--
1.7.2.3
