From b35890cc353b6aac1e42fb0bfd6e971fd9ca9f42 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 22 Oct 2012 22:53:20 -0400
Subject: [PATCH] --- yaml --- r: 340356 b: refs/heads/master c:
 18c26c27ae0abe82253cb2e2363df465dbbb657e h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/ia64/kernel/smpboot.c       | 5 -----
 trunk/arch/x86/include/asm/processor.h | 2 --
 trunk/arch/x86/kernel/cpu/common.c     | 9 ---------
 trunk/kernel/fork.c                    | 6 ------
 5 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 5ca36e7f0d9e..6d2fcc5dcb55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62e791c1b8ea481c72c299dee4f62c04aaef765c
+refs/heads/master: 18c26c27ae0abe82253cb2e2363df465dbbb657e
diff --git a/trunk/arch/ia64/kernel/smpboot.c b/trunk/arch/ia64/kernel/smpboot.c
index 963d2db53bfa..6a368cb2043e 100644
--- a/trunk/arch/ia64/kernel/smpboot.c
+++ b/trunk/arch/ia64/kernel/smpboot.c
@@ -460,11 +460,6 @@ start_secondary (void *unused)
 	return 0;
 }
 
-struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
-{
-	return NULL;
-}
-
 static int __cpuinit
 do_boot_cpu (int sapicid, int cpu, struct task_struct *idle)
 {
diff --git a/trunk/arch/x86/include/asm/processor.h b/trunk/arch/x86/include/asm/processor.h
index ad1fc8511674..92f48a5a6b2e 100644
--- a/trunk/arch/x86/include/asm/processor.h
+++ b/trunk/arch/x86/include/asm/processor.h
@@ -178,8 +178,6 @@ static inline int hlt_works(int cpu)
 
 extern void cpu_detect(struct cpuinfo_x86 *c);
 
-extern struct pt_regs *idle_regs(struct pt_regs *);
-
 extern void early_cpu_init(void);
 extern void identify_boot_cpu(void);
 extern void identify_secondary_cpu(struct cpuinfo_x86 *);
diff --git a/trunk/arch/x86/kernel/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c
index 7505f7b13e71..6a6432cf89de 100644
--- a/trunk/arch/x86/kernel/cpu/common.c
+++ b/trunk/arch/x86/kernel/cpu/common.c
@@ -1173,15 +1173,6 @@ DEFINE_PER_CPU(struct task_struct *, fpu_owner_task);
 DEFINE_PER_CPU_ALIGNED(struct stack_canary, stack_canary);
 #endif
 
-/* Make sure %fs and %gs are initialized properly in idle threads */
-struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
-{
-	memset(regs, 0, sizeof(struct pt_regs));
-	regs->fs = __KERNEL_PERCPU;
-	regs->gs = __KERNEL_STACK_CANARY;
-
-	return regs;
-}
 #endif	/* CONFIG_X86_64 */
 
 /*
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index fa24a78b94f2..0e68b6686acb 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -1514,12 +1514,6 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 	return ERR_PTR(retval);
 }
 
-noinline struct pt_regs * __cpuinit __attribute__((weak)) idle_regs(struct pt_regs *regs)
-{
-	memset(regs, 0, sizeof(struct pt_regs));
-	return regs;
-}
-
 static inline void init_idle_pids(struct pid_link *links)
 {
 	enum pid_type type;