Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea6200e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b4fb8f66 fc69910f

arch/mips/cavium-octeon/cpu.c

+2 −0
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ 
#include <linux/irqflags.h>

#include <linux/notifier.h>

#include <linux/prefetch.h>

#include <linux/ptrace.h>

#include <linux/sched.h>

#include <linux/sched/task_stack.h>



#include <asm/cop2.h>

#include <asm/current.h>

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

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <asm/cop2.h>

#include <linux/export.h>

#include <linux/interrupt.h>

#include <linux/sched/task_stack.h>



#include "octeon-crypto.h"

arch/mips/cavium-octeon/smp.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/kernel_stat.h>

#include <linux/sched.h>

#include <linux/sched/hotplug.h>

#include <linux/sched/task_stack.h>

#include <linux/init.h>

#include <linux/export.h>

arch/mips/include/asm/fpu.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <linux/sched.h>

#include <linux/sched/task_stack.h>

#include <linux/ptrace.h>

#include <linux/thread_info.h>

#include <linux/bitops.h>

arch/mips/kernel/smp-bmips.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/init.h>

#include <linux/sched.h>

#include <linux/sched/hotplug.h>

#include <linux/sched/task_stack.h>

#include <linux/mm.h>

#include <linux/delay.h>

#include <linux/smp.h>