diff options
author | Arnd Bergmann | 2018-02-15 09:16:57 -0600 |
---|---|---|
committer | Greg Kroah-Hartman | 2018-02-22 08:45:01 -0600 |
commit | 4b35dcb5e048cde1a68603d5ad2d8ccaf3fb1e4e (patch) | |
tree | 13e23f8991c83d9950b695b2b8c2aecd6ae938b5 | |
parent | bb18512819952a468c8f618fbf0b9a470a854a06 (diff) | |
download | kernel-omap-4b35dcb5e048cde1a68603d5ad2d8ccaf3fb1e4e.tar.gz kernel-omap-4b35dcb5e048cde1a68603d5ad2d8ccaf3fb1e4e.tar.xz kernel-omap-4b35dcb5e048cde1a68603d5ad2d8ccaf3fb1e4e.zip |
x86: fix build warnign with 32-bit PAE
I ran into a 4.9 build warning in randconfig testing, starting with the
KAISER patches:
arch/x86/kernel/ldt.c: In function 'alloc_ldt_struct':
arch/x86/include/asm/pgtable_types.h:208:24: error: large integer implicitly truncated to unsigned type [-Werror=overflow]
#define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
^
arch/x86/kernel/ldt.c:81:6: note: in expansion of macro '__PAGE_KERNEL'
__PAGE_KERNEL);
^~~~~~~~~~~~~
I originally ran into this last year when the patches were part of linux-next,
and tried to work around it by using the proper 'pteval_t' types consistently,
but that caused additional problems.
This takes a much simpler approach, and makes the argument type of the dummy
helper always 64-bit, which is wide enough for any page table layout and
won't hurt since this call is just an empty stub anyway.
Fixes: 8f0baadf2bea ("kaiser: merged update")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | include/linux/kaiser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kaiser.h b/include/linux/kaiser.h index 58c55b1589d0..b56c19010480 100644 --- a/include/linux/kaiser.h +++ b/include/linux/kaiser.h | |||
@@ -32,7 +32,7 @@ static inline void kaiser_init(void) | |||
32 | { | 32 | { |
33 | } | 33 | } |
34 | static inline int kaiser_add_mapping(unsigned long addr, | 34 | static inline int kaiser_add_mapping(unsigned long addr, |
35 | unsigned long size, unsigned long flags) | 35 | unsigned long size, u64 flags) |
36 | { | 36 | { |
37 | return 0; | 37 | return 0; |
38 | } | 38 | } |