diff options
| author |   Andy Lutomirski <luto@kernel.org> | 2016-04-26 12:23:24 -0700 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2016-04-29 11:56:40 +0200 |
| commit | 35de5b0692aaa1f99803044526f2cc00ff864426 (patch) | |
| tree | 732d75585dc712e55261d61b6653a3a63db95a07 /arch/x86/kernel/module.c | |
| parent | Merge branch 'x86/urgent' into x86/asm, to refresh the tree (diff) | |
| download | linux-dev-35de5b0692aaa1f99803044526f2cc00ff864426.tar.xz linux-dev-35de5b0692aaa1f99803044526f2cc00ff864426.zip | |
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/kernel/module.c')
| -rw-r--r-- | arch/x86/kernel/module.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c index 005c03e93fc5..477ae806c2fa 100644 --- a/arch/x86/kernel/module.c +++ b/arch/x86/kernel/module.c @@ -31,6 +31,7 @@ #include <linux/jump_label.h> #include <linux/random.h> +#include <asm/text-patching.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/setup.h> |