aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/kernel/smpboot.c5
-rw-r--r--arch/x86/include/asm/processor.h2
-rw-r--r--arch/x86/kernel/cpu/common.c9
-rw-r--r--kernel/fork.c6
4 files changed, 0 insertions, 22 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 963d2db53bfa..6a368cb2043e 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -460,11 +460,6 @@ start_secondary (void *unused)
460 return 0; 460 return 0;
461} 461}
462 462
463struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
464{
465 return NULL;
466}
467
468static int __cpuinit 463static int __cpuinit
469do_boot_cpu (int sapicid, int cpu, struct task_struct *idle) 464do_boot_cpu (int sapicid, int cpu, struct task_struct *idle)
470{ 465{
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index ad1fc8511674..92f48a5a6b2e 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -178,8 +178,6 @@ static inline int hlt_works(int cpu)
178 178
179extern void cpu_detect(struct cpuinfo_x86 *c); 179extern void cpu_detect(struct cpuinfo_x86 *c);
180 180
181extern struct pt_regs *idle_regs(struct pt_regs *);
182
183extern void early_cpu_init(void); 181extern void early_cpu_init(void);
184extern void identify_boot_cpu(void); 182extern void identify_boot_cpu(void);
185extern void identify_secondary_cpu(struct cpuinfo_x86 *); 183extern void identify_secondary_cpu(struct cpuinfo_x86 *);
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 7505f7b13e71..6a6432cf89de 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1173,15 +1173,6 @@ DEFINE_PER_CPU(struct task_struct *, fpu_owner_task);
1173DEFINE_PER_CPU_ALIGNED(struct stack_canary, stack_canary); 1173DEFINE_PER_CPU_ALIGNED(struct stack_canary, stack_canary);
1174#endif 1174#endif
1175 1175
1176/* Make sure %fs and %gs are initialized properly in idle threads */
1177struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
1178{
1179 memset(regs, 0, sizeof(struct pt_regs));
1180 regs->fs = __KERNEL_PERCPU;
1181 regs->gs = __KERNEL_STACK_CANARY;
1182
1183 return regs;
1184}
1185#endif /* CONFIG_X86_64 */ 1176#endif /* CONFIG_X86_64 */
1186 1177
1187/* 1178/*
diff --git a/kernel/fork.c b/kernel/fork.c
index fa24a78b94f2..0e68b6686acb 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1514,12 +1514,6 @@ fork_out:
1514 return ERR_PTR(retval); 1514 return ERR_PTR(retval);
1515} 1515}
1516 1516
1517noinline struct pt_regs * __cpuinit __attribute__((weak)) idle_regs(struct pt_regs *regs)
1518{
1519 memset(regs, 0, sizeof(struct pt_regs));
1520 return regs;
1521}
1522
1523static inline void init_idle_pids(struct pid_link *links) 1517static inline void init_idle_pids(struct pid_link *links)
1524{ 1518{
1525 enum pid_type type; 1519 enum pid_type type;