diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-02-05 06:11:03 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-03-02 19:45:38 -0500 |
commit | 2c873d55cd838deef8218b6d5fe9bd336cb3113a (patch) | |
tree | 69cdac9daa1b9d2985eccc31f4866fc9dd74303e | |
parent | b68070e146b9c2b4ece8d869a4fab9a4f14bbfb4 (diff) |
sched/core: Remove unused prefetch_stack()
prefetch_stack() is defined by IA64, but not actually used anywhere anymore.
Remove it.
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/ia64/include/asm/processor.h | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/entry.S | 23 | ||||
-rw-r--r-- | include/linux/sched.h | 6 |
3 files changed, 0 insertions, 31 deletions
diff --git a/arch/ia64/include/asm/processor.h b/arch/ia64/include/asm/processor.h index 03911a336406..26a63d69c599 100644 --- a/arch/ia64/include/asm/processor.h +++ b/arch/ia64/include/asm/processor.h | |||
@@ -19,8 +19,6 @@ | |||
19 | #include <asm/ptrace.h> | 19 | #include <asm/ptrace.h> |
20 | #include <asm/ustack.h> | 20 | #include <asm/ustack.h> |
21 | 21 | ||
22 | #define ARCH_HAS_PREFETCH_SWITCH_STACK | ||
23 | |||
24 | #define IA64_NUM_PHYS_STACK_REG 96 | 22 | #define IA64_NUM_PHYS_STACK_REG 96 |
25 | #define IA64_NUM_DBG_REGS 8 | 23 | #define IA64_NUM_DBG_REGS 8 |
26 | 24 | ||
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 6f27a663177c..e7a716b09350 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
@@ -455,29 +455,6 @@ GLOBAL_ENTRY(load_switch_stack) | |||
455 | br.cond.sptk.many b7 | 455 | br.cond.sptk.many b7 |
456 | END(load_switch_stack) | 456 | END(load_switch_stack) |
457 | 457 | ||
458 | GLOBAL_ENTRY(prefetch_stack) | ||
459 | add r14 = -IA64_SWITCH_STACK_SIZE, sp | ||
460 | add r15 = IA64_TASK_THREAD_KSP_OFFSET, in0 | ||
461 | ;; | ||
462 | ld8 r16 = [r15] // load next's stack pointer | ||
463 | lfetch.fault.excl [r14], 128 | ||
464 | ;; | ||
465 | lfetch.fault.excl [r14], 128 | ||
466 | lfetch.fault [r16], 128 | ||
467 | ;; | ||
468 | lfetch.fault.excl [r14], 128 | ||
469 | lfetch.fault [r16], 128 | ||
470 | ;; | ||
471 | lfetch.fault.excl [r14], 128 | ||
472 | lfetch.fault [r16], 128 | ||
473 | ;; | ||
474 | lfetch.fault.excl [r14], 128 | ||
475 | lfetch.fault [r16], 128 | ||
476 | ;; | ||
477 | lfetch.fault [r16], 128 | ||
478 | br.ret.sptk.many rp | ||
479 | END(prefetch_stack) | ||
480 | |||
481 | /* | 458 | /* |
482 | * Invoke a system call, but do some tracing before and after the call. | 459 | * Invoke a system call, but do some tracing before and after the call. |
483 | * We MUST preserve the current register frame throughout this routine | 460 | * We MUST preserve the current register frame throughout this routine |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 5720d11f3224..bd0111a06aa2 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -247,12 +247,6 @@ struct sched_info { | |||
247 | # define SCHED_FIXEDPOINT_SHIFT 10 | 247 | # define SCHED_FIXEDPOINT_SHIFT 10 |
248 | # define SCHED_FIXEDPOINT_SCALE (1L << SCHED_FIXEDPOINT_SHIFT) | 248 | # define SCHED_FIXEDPOINT_SCALE (1L << SCHED_FIXEDPOINT_SHIFT) |
249 | 249 | ||
250 | #ifdef ARCH_HAS_PREFETCH_SWITCH_STACK | ||
251 | extern void prefetch_stack(struct task_struct *t); | ||
252 | #else | ||
253 | static inline void prefetch_stack(struct task_struct *t) { } | ||
254 | #endif | ||
255 | |||
256 | struct load_weight { | 250 | struct load_weight { |
257 | unsigned long weight; | 251 | unsigned long weight; |
258 | u32 inv_weight; | 252 | u32 inv_weight; |