Merge /spare/repo/linux-2.6/

1 files changed, 0 insertions, 5 deletions

diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index 66255434128a..7d10b0397091 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -607,11 +607,6 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
         struct thread_info *t = p->thread_info;
         char *child_trap_frame;
 
-#ifdef CONFIG_DEBUG_SPINLOCK
-        p->thread.smp_lock_count = 0;
-        p->thread.smp_lock_pc = 0;
-#endif
-
         /* Calculate offset to stack_frame & pt_regs */
         child_trap_frame = ((char *)t) + (THREAD_SIZE - (TRACEREG_SZ+STACKFRAME_SZ));
         memcpy(child_trap_frame, (((struct sparc_stackf *)regs)-1), (TRACEREG_SZ+STACKFRAME_SZ));