Skip to content

Commit ea6200e

Browse files
committed
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull sched.h split-up fixes for MIPS from Ingo Molnar: "These are the fixes for MIPS build failures due to the sched.h split-up, from Arnd Bergmann" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: MIPS: Add missing include files
2 parents b4fb8f6 + fc69910 commit ea6200e

File tree

14 files changed

+20
-0
lines changed

14 files changed

+20
-0
lines changed

arch/mips/cavium-octeon/cpu.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
#include <linux/irqflags.h>
1111
#include <linux/notifier.h>
1212
#include <linux/prefetch.h>
13+
#include <linux/ptrace.h>
1314
#include <linux/sched.h>
15+
#include <linux/sched/task_stack.h>
1416

1517
#include <asm/cop2.h>
1618
#include <asm/current.h>

arch/mips/cavium-octeon/crypto/octeon-crypto.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <asm/cop2.h>
1010
#include <linux/export.h>
1111
#include <linux/interrupt.h>
12+
#include <linux/sched/task_stack.h>
1213

1314
#include "octeon-crypto.h"
1415

arch/mips/cavium-octeon/smp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <linux/kernel_stat.h>
1313
#include <linux/sched.h>
1414
#include <linux/sched/hotplug.h>
15+
#include <linux/sched/task_stack.h>
1516
#include <linux/init.h>
1617
#include <linux/export.h>
1718

arch/mips/include/asm/fpu.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include <linux/sched.h>
1414
#include <linux/sched/task_stack.h>
15+
#include <linux/ptrace.h>
1516
#include <linux/thread_info.h>
1617
#include <linux/bitops.h>
1718

arch/mips/kernel/smp-bmips.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/init.h>
1212
#include <linux/sched.h>
1313
#include <linux/sched/hotplug.h>
14+
#include <linux/sched/task_stack.h>
1415
#include <linux/mm.h>
1516
#include <linux/delay.h>
1617
#include <linux/smp.h>

arch/mips/kernel/smp-mt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <linux/interrupt.h>
2424
#include <linux/irqchip/mips-gic.h>
2525
#include <linux/compiler.h>
26+
#include <linux/sched/task_stack.h>
2627
#include <linux/smp.h>
2728

2829
#include <linux/atomic.h>

arch/mips/loongson64/loongson-3/cop2-ex.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/init.h>
1414
#include <linux/sched.h>
1515
#include <linux/notifier.h>
16+
#include <linux/ptrace.h>
1617

1718
#include <asm/fpu.h>
1819
#include <asm/cop2.h>

arch/mips/netlogic/common/smp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include <linux/kernel.h>
3636
#include <linux/delay.h>
3737
#include <linux/init.h>
38+
#include <linux/sched/task_stack.h>
3839
#include <linux/smp.h>
3940
#include <linux/irq.h>
4041

arch/mips/netlogic/xlp/cop2-ex.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@
99
* Copyright (C) 2009 Wind River Systems,
1010
* written by Ralf Baechle <[email protected]>
1111
*/
12+
#include <linux/capability.h>
1213
#include <linux/init.h>
1314
#include <linux/irqflags.h>
1415
#include <linux/notifier.h>
1516
#include <linux/prefetch.h>
17+
#include <linux/ptrace.h>
1618
#include <linux/sched.h>
19+
#include <linux/sched/task_stack.h>
1720

1821
#include <asm/cop2.h>
1922
#include <asm/current.h>

arch/mips/sgi-ip22/ip28-berr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <linux/kernel.h>
1010
#include <linux/sched.h>
1111
#include <linux/sched/debug.h>
12+
#include <linux/sched/signal.h>
1213
#include <linux/seq_file.h>
1314

1415
#include <asm/addrspace.h>

arch/mips/sgi-ip27/ip27-berr.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
#include <linux/signal.h> /* for SIGBUS */
1313
#include <linux/sched.h> /* schow_regs(), force_sig() */
1414
#include <linux/sched/debug.h>
15+
#include <linux/sched/signal.h>
1516

17+
#include <asm/ptrace.h>
1618
#include <asm/sn/addrs.h>
1719
#include <asm/sn/arch.h>
1820
#include <asm/sn/sn0/hub.h>

arch/mips/sgi-ip27/ip27-smp.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@
88
*/
99
#include <linux/init.h>
1010
#include <linux/sched.h>
11+
#include <linux/sched/task_stack.h>
1112
#include <linux/topology.h>
1213
#include <linux/nodemask.h>
14+
1315
#include <asm/page.h>
1416
#include <asm/processor.h>
17+
#include <asm/ptrace.h>
1518
#include <asm/sn/arch.h>
1619
#include <asm/sn/gda.h>
1720
#include <asm/sn/intr.h>

arch/mips/sgi-ip32/ip32-berr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/kernel.h>
1212
#include <linux/sched.h>
1313
#include <linux/sched/debug.h>
14+
#include <linux/sched/signal.h>
1415
#include <asm/traps.h>
1516
#include <linux/uaccess.h>
1617
#include <asm/addrspace.h>

arch/mips/sgi-ip32/ip32-reset.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/kernel.h>
1414
#include <linux/module.h>
1515
#include <linux/sched.h>
16+
#include <linux/sched/signal.h>
1617
#include <linux/notifier.h>
1718
#include <linux/delay.h>
1819
#include <linux/rtc/ds1685.h>

0 commit comments

Comments
 (0)