diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-05-24 18:48:24 -0600 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-09-30 16:25:42 +0200 |
| commit | eb9589e5c7ddcf59702ef7b105eb3a1ef065887a (patch) | |
| tree | 6fd36d5ecd43ba8c270b08d54115fa211889b4c0 | |
| parent | sched: sched_statistics is only defined for CONFIG_SCHEDSTATS systems (diff) | |
| download | rhel7-kernel-misery-eb9589e5c7ddcf59702ef7b105eb3a1ef065887a.tar.xz rhel7-kernel-misery-eb9589e5c7ddcf59702ef7b105eb3a1ef065887a.zip | |
x86: pud_trans_huge is already defined generically for the nop inline
When pud_trans_huge is not required, the stub function is already
defined in the asm-generic code, so adding it here too results in a
compiler error. To fix this bug, we just get rid of the second
superfluous definition, as well as the third in asm-generic itself,
where the set of conditions for its inclusion overlapped.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | arch/x86/include/asm/pgtable.h | 9 | ||||
| -rw-r--r-- | include/asm-generic/pgtable.h | 4 |
2 files changed, 0 insertions, 13 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 88926233768..e39cd5a8bd5 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1101,15 +1101,6 @@ static inline int pmd_write(pmd_t pmd) return pmd_flags(pmd) & _PAGE_RW; } -#if !defined(CONFIG_TRANSPARENT_HUGEPAGE) || \ - (defined(CONFIG_TRANSPARENT_HUGEPAGE) && \ - !defined(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD)) -static inline int pud_trans_huge(pud_t pud) -{ - return 0; -} -#endif - #define __HAVE_ARCH_PMDP_GET_AND_CLEAR static inline pmd_t pmdp_get_and_clear(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp) diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 4cea7a5f709..16a4514b4fe 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -629,10 +629,6 @@ static inline int pmd_trans_splitting(pmd_t pmd) { return 0; } -static inline int pud_trans_huge(pud_t pud) -{ - return 0; -} static inline int pud_trans_splitting(pud_t pud) { return 0; |