diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-03-16 09:50:50 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-03-16 09:50:50 +0100 |
commit | 2b95bd7d58d368fe5dcbe6f4e494847ea082d89d (patch) | |
tree | 48c38d792f31f2fe10b26b03bdf1b10a82ca03a4 /arch/mips/loongson64 | |
parent | Merge tag 'perf-core-for-mingo-4.12-20170314' of git://git.kernel.org/pub/scm... (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-block (diff) | |
download | linux-2b95bd7d58d368fe5dcbe6f4e494847ea082d89d.tar.xz linux-2b95bd7d58d368fe5dcbe6f4e494847ea082d89d.zip |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/loongson64')
-rw-r--r-- | arch/mips/loongson64/loongson-3/cop2-ex.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/loongson64/loongson-3/cop2-ex.c b/arch/mips/loongson64/loongson-3/cop2-ex.c index ea13764d0a03..621d6af5f6eb 100644 --- a/arch/mips/loongson64/loongson-3/cop2-ex.c +++ b/arch/mips/loongson64/loongson-3/cop2-ex.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/notifier.h> +#include <linux/ptrace.h> #include <asm/fpu.h> #include <asm/cop2.h> |