History

mm: remove __ARCH_HAS_4LEVEL_HACK and include/asm-generic/4level-fixup.h

There are no architectures that use include/asm-generic/4level-fixup.h therefore it can be removed along with __ARCH_HAS_4LEVEL_HACK define.

Mike Rapoport committed 6 years ago

Commit f9492861 parent e19f97e3 files · +5 −52Browse files

Showing the changes to include/linux (1 of 3 files). Show all

Unified · Split

include/linux/mm.h+5−5
@@ -1838,12 +1838,12 @@ static inline void mm_dec_nr_ptes(struct mm_struct *mm) {} · 1837 unmodified lines
18381838 int __pte_alloc(struct mm_struct *mm, pmd_t *pmd);
18391839 int __pte_alloc_kernel(pmd_t *pmd);
18401840
1841+#if defined(CONFIG_MMU)
1842+
18411843 /*
1842− * The following ifdef needed to get the 4level-fixup.h header to work.
1843− * Remove it when 4level-fixup.h has been removed.
1844+ * The following ifdef needed to get the 5level-fixup.h header to work.
1845+ * Remove it when 5level-fixup.h has been removed.
18441846 */
1845−#if defined(CONFIG_MMU) && !defined(__ARCH_HAS_4LEVEL_HACK)
1846−
18471847 #ifndef __ARCH_HAS_5LEVEL_HACK
18481848 static inline p4d_t *p4d_alloc(struct mm_struct *mm, pgd_t *pgd,
18491849 unsigned long address)
@@ -1865,7 +1865,7 @@ static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long a · 15 unmodified lines
18651865 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
18661866 NULL: pmd_offset(pud, address);
18671867 }
1868−#endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
1868+#endif /* CONFIG_MMU */
18691869
18701870 #if USE_SPLIT_PTE_PTLOCKS
18711871 #if ALLOC_SPLIT_PTLOCKS

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t