diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2017-04-13 00:48:47 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2017-04-13 00:48:47 +0200 |
| commit | e469b23cdec0fc8c49102882920e3951530e1740 (patch) | |
| tree | 7ef4e37f4c576c984157e897e7a461cea13f5983 /arch/mips/kernel/relocate.c | |
| parent | MIPS: Remove confusing else statement in __do_page_fault() (diff) | |
| parent | MIPS: KGDB: Use kernel context for sleeping threads (diff) | |
| download | linux-e469b23cdec0fc8c49102882920e3951530e1740.tar.xz linux-e469b23cdec0fc8c49102882920e3951530e1740.zip | |
Merge branch '4.11-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/relocate.c')
| -rw-r--r-- | arch/mips/kernel/relocate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/relocate.c b/arch/mips/kernel/relocate.c index 9103bebc9a8e..2d1a0c438771 100644 --- a/arch/mips/kernel/relocate.c +++ b/arch/mips/kernel/relocate.c @@ -18,7 +18,7 @@ #include <linux/kernel.h> #include <linux/libfdt.h> #include <linux/of_fdt.h> -#include <linux/sched.h> +#include <linux/sched/task.h> #include <linux/start_kernel.h> #include <linux/string.h> #include <linux/printk.h> |