diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-05-24 18:57:32 -0600 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-09-30 16:25:42 +0200 |
| commit | ae48ab16817e5faf4b2cc5bdd358eae88ea09db4 (patch) | |
| tree | 77907ae44d1162102d533ce8b063160874146df9 | |
| parent | mm: include sched.h for task_struct usage (diff) | |
| download | rhel7-kernel-misery-ae48ab16817e5faf4b2cc5bdd358eae88ea09db4.tar.xz rhel7-kernel-misery-ae48ab16817e5faf4b2cc5bdd358eae88ea09db4.zip | |
pgtable: properly ifdef out second definition of pud_write
There's a conflicting definition in include/linux/pgtable.h, which is
only enabled for CONFIG_X86_64, so make these two sets of conditions
actually exclusive to avoid the clash.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | include/asm-generic/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 16a4514b4fe..8c9a8d63692 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -640,7 +640,7 @@ static inline int pmd_write(pmd_t pmd) return 0; } #endif /* __HAVE_ARCH_PMD_WRITE */ -#ifndef __HAVE_ARCH_PUD_WRITE +#if !defined(__HAVE_ARCH_PUD_WRITE) && !defined(CONFIG_X86_64) static inline int pud_write(pud_t pud) { BUG(); |