summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/setup.h
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@kernel.org>2016-04-26 22:23:24 +0300
committerIngo Molnar <mingo@kernel.org>2016-04-29 12:56:40 +0300
commit35de5b0692aaa1f99803044526f2cc00ff864426 (patch)
tree732d75585dc712e55261d61b6653a3a63db95a07 /arch/x86/include/asm/setup.h
parentffc5fce9a96303c3e16232a6bdf8827af6adb604 (diff)
downloadlinux-35de5b0692aaa1f99803044526f2cc00ff864426.tar.xz
x86/asm: Stop depending on ptrace.h in alternative.h
alternative.h pulls in ptrace.h, which means that alternatives can't be used in anything referenced from ptrace.h, which is a mess. Break the dependency by pulling text patching helpers into their own header. Signed-off-by: Andy Lutomirski <luto@kernel.org> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/99b93b13f2c9eb671f5c98bba4c2cbdc061293a2.1461698311.git.luto@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/setup.h')
-rw-r--r--arch/x86/include/asm/setup.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index 11af24e09c8a..ac1d5da14734 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -6,6 +6,7 @@
#define COMMAND_LINE_SIZE 2048
#include <linux/linkage.h>
+#include <asm/page_types.h>
#ifdef __i386__