diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-15 02:24:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-15 02:24:53 -0400 |
| commit | d4b80afbba49e968623330f1336da8c724da8aad (patch) | |
| tree | a9478bd77d8b001a6a7119328d34e9666d7bfe93 /arch/powerpc/mm/fault.c | |
| parent | fcd709ef20a9d83bdb7524d27cd6719dac8690a0 (diff) | |
| parent | 4cea8776571b18db7485930cb422faa739580c8c (diff) | |
Merge branch 'linus' into x86/asm, to pick up recent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/mm/fault.c')
| -rw-r--r-- | arch/powerpc/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index a4db22f65021..bb1ffc559f38 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
| 27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 28 | #include <linux/highmem.h> | 28 | #include <linux/highmem.h> |
| 29 | #include <linux/module.h> | 29 | #include <linux/extable.h> |
| 30 | #include <linux/kprobes.h> | 30 | #include <linux/kprobes.h> |
| 31 | #include <linux/kdebug.h> | 31 | #include <linux/kdebug.h> |
| 32 | #include <linux/perf_event.h> | 32 | #include <linux/perf_event.h> |