]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
x86/mm/ASLR: Avoid PAGE_SIZE redefinition for UML subarch
authorJiri Kosina <jkosina@suse.cz>
Fri, 20 Feb 2015 09:18:59 +0000 (10:18 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 20 Feb 2015 09:55:32 +0000 (10:55 +0100)
commit570e1aa84c376ff39809442f09c7606ddf62cfd1
treeb0728432c0f7d9b2f4a13fa44bda309a11c49349
parent1fbe23e0dea54e30f39f26ae90150ea7ebb48f79
x86/mm/ASLR: Avoid PAGE_SIZE redefinition for UML subarch

Commit f47233c2d34 ("x86/mm/ASLR: Propagate base load address
calculation") causes PAGE_SIZE redefinition warnings for UML
subarch  builds. This is caused by added includes that were
leftovers from previous  patch versions are are not actually
needed (especially page_types.h  inlcude in module.c). Drop
those stray includes.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Cc: Borislav Petkov <bp@suse.de>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: Kees Cook <keescook@chromium.org>
Link: http://lkml.kernel.org/r/alpine.LNX.2.00.1502201017240.28769@pobox.suse.cz
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/page_types.h
arch/x86/kernel/module.c