]> git.baikalelectronics.ru Git - kernel.git/commit
mm, x86: Fix native_pud_clear build error
authorArnd Bergmann <arnd@arndb.de>
Tue, 14 Mar 2017 12:12:53 +0000 (13:12 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 14 Mar 2017 19:30:30 +0000 (20:30 +0100)
commitbf6146e48f8c1e72886d108427fce024aa250cbe
tree9dc115cd8d8238141a578b21c8da6639b46cb4dc
parentab3783c6ca858f75e3e5f88565518662fed70bd7
mm, x86: Fix native_pud_clear build error

We still get a build error in random configurations, after this has been
modified a few times:

In file included from include/linux/mm.h:68:0,
                 from include/linux/suspend.h:8,
                 from arch/x86/kernel/asm-offsets.c:12:
arch/x86/include/asm/pgtable.h:66:26: error: redefinition of 'native_pud_clear'
 #define pud_clear(pud)   native_pud_clear(pud)

My interpretation is that the build error comes from a typo in __PAGETABLE_PUD_FOLDED,
so fix that typo now, and remove the incorrect #ifdef around the native_pud_clear
definition.

Fixes: 62e1dcced4b8 ("mm, x86: fix HIGHMEM64 && PARAVIRT build config for native_pud_clear()")
Fixes: 613335b9fc41 ("mm, x86: add support for PUD-sized transparent hugepages")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Dave Jiang <dave.jiang@intel.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Borislav Petkov <bp@suse.de>
Cc: Thomas Garnier <thgarnie@google.com>
Link: http://lkml.kernel.org/r/20170314121330.182155-1-arnd@arndb.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/include/asm/pgtable-3level.h
arch/x86/include/asm/pgtable.h