diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-18 17:59:09 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-18 18:03:09 +1000 |
| commit | 58fcdbc57c69f7ff53493bcffbdfc422bad4fa8b (patch) | |
| tree | c23bd3bd16625688218c147d9ae29eef165b4724 | |
| parent | bd6a174b785d3e8c3f45dc5d3dc5f9ed32134778 (diff) | |
kprobes/x86: merge fix for set_memory.h decoupling
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | arch/x86/kernel/kprobes/core.c | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/kprobes/opt.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index 19e1f2a6d7b0..5b2bbfbb3712 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -61,6 +61,7 @@ #include <asm/alternative.h> #include <asm/insn.h> #include <asm/debugreg.h> +#include <asm/set_memory.h> #include "common.h" diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c index 9aadff3d0902..901c640d152f 100644 --- a/arch/x86/kernel/kprobes/opt.c +++ b/arch/x86/kernel/kprobes/opt.c @@ -37,6 +37,7 @@ #include <asm/alternative.h> #include <asm/insn.h> #include <asm/debugreg.h> +#include <asm/set_memory.h> #include "common.h" |