Skip to contentSkip to conversation

MIPS: Fix build breakage caused by header file changes

PATCH Superseded Guenter Roeck 1 participant 2 messages Mar 6, 2017 MIPS

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 MIPS: Fix build breakage caused by header file changes

Since commit f3ac60671954 ("sched/headers: Move task-stack related APIs from <linux/sched.h> to <linux/sched/task_stack.h>") and commit f780d89a0e82 ("sched/headers: Remove <asm/ptrace.h> from <linux/sched.h>"), various mips builds fail as follows.

arch/mips/kernel/smp-mt.c: In function ‘vsmp_boot_secondary’:
arch/mips/include/asm/processor.h:384:41: error:
implicit declaration of function ‘task_stack_page’

In file included from
/opt/buildbot/slave/hwmon-testing/build/arch/mips/kernel/pm.c:
arch/mips/include/asm/fpu.h: In function '__own_fpu':
arch/mips/include/asm/processor.h:385:31: error:
invalid application of 'sizeof' to incomplete type 'struct pt_regs'

arch/mips/netlogic/common/smp.c: In function 'nlm_boot_secondary':
arch/mips/netlogic/common/smp.c:157:2: error:
implicit declaration of function 'task_stack_page'

arch/mips/cavium-octeon/cpu.c: In function 'cnmips_cu2_call':
arch/mips/include/asm/processor.h:386:36: error:
implicit declaration of function 'task_stack_page'

Fixes f3ac60671954 ("sched/headers: Move task-stack related APIs ...")
Fixes f780d89a0e82 ("sched/headers: Remove <asm/ptrace.h> from ...")
Cc Ingo Molnar <[email protected]>

---
v2: More files needed a fix.

 arch/mips/cavium-octeon/cpu.c   | 3 ++-
 arch/mips/kernel/pm.c           | 1 +
 arch/mips/kernel/smp-mt.c       | 2 +-
 arch/mips/netlogic/common/smp.c | 1 +
 arch/mips/power/cpu.c           | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)
arch/mips/cavium-octeon/cpu.c +2 -1
index a5b427909b5c..f833a5d8261b 100644
@@ -10,7 +10,8 @@
 #include <linux/irqflags.h>
 #include <linux/notifier.h>
 #include <linux/prefetch.h>
-#include <linux/sched.h>
+#include <linux/sched/task_stack.h>
+#include <linux/ptrace.h>
 
 #include <asm/cop2.h>
 #include <asm/current.h>
arch/mips/kernel/pm.c +1 -0
index dc814892133c..fab05022ab39 100644
@@ -11,6 +11,7 @@
 
 #include <linux/cpu_pm.h>
 #include <linux/init.h>
+#include <linux/ptrace.h>
 
 #include <asm/dsp.h>
 #include <asm/fpu.h>
arch/mips/kernel/smp-mt.c +1 -1
index e077ea3e11fb..effc1ed18954 100644
@@ -18,7 +18,7 @@
  * Copyright (C) 2006 Ralf Baechle ([email protected])
  */
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/sched/task_stack.h>
 #include <linux/cpumask.h>
 #include <linux/interrupt.h>
 #include <linux/irqchip/mips-gic.h>
arch/mips/netlogic/common/smp.c +1 -0
index 10d86d54880a..9035558920c1 100644
@@ -37,6 +37,7 @@
 #include <linux/init.h>
 #include <linux/smp.h>
 #include <linux/irq.h>
+#include <linux/sched/task_stack.h>
 
 #include <asm/mmu_context.h>
 
arch/mips/power/cpu.c +1 -0
index 2129e67723ff..6ecccc26bf7f 100644
@@ -7,6 +7,7 @@
  * Author: Hu Hongbing <[email protected]>
  *	   Wu Zhangjin <[email protected]>
  */
+#include <linux/ptrace.h>
 #include <asm/sections.h>
 #include <asm/fpu.h>
 #include <asm/dsp.h>
Signature · 1 line
2.7.4
#1 lore raw
Quoted 23 lines · Guenter Roeck

Since commit f3ac60671954 ("sched/headers: Move task-stack related APIs from <linux/sched.h> to <linux/sched/task_stack.h>") and commit f780d89a0e82 ("sched/headers: Remove <asm/ptrace.h> from <linux/sched.h>"), various mips builds fail as follows.

arch/mips/kernel/smp-mt.c: In function ‘vsmp_boot_secondary’:
arch/mips/include/asm/processor.h:384:41: error:
implicit declaration of function ‘task_stack_page’

In file included from
/opt/buildbot/slave/hwmon-testing/build/arch/mips/kernel/pm.c:
arch/mips/include/asm/fpu.h: In function '__own_fpu':
arch/mips/include/asm/processor.h:385:31: error:
invalid application of 'sizeof' to incomplete type 'struct pt_regs'

arch/mips/netlogic/common/smp.c: In function 'nlm_boot_secondary':
arch/mips/netlogic/common/smp.c:157:2: error:
implicit declaration of function 'task_stack_page'

arch/mips/cavium-octeon/cpu.c: In function 'cnmips_cu2_call':
arch/mips/include/asm/processor.h:386:36: error:
implicit declaration of function 'task_stack_page'

Quoted 6 lines
Fixes f3ac60671954 ("sched/headers: Move task-stack related APIs ...")
Fixes f780d89a0e82 ("sched/headers: Remove <asm/ptrace.h> from ...")
Cc Ingo Molnar <[email protected]>

---
v2: More files needed a fix.

Sigh. More breakage found. v3 coming.

Guenter