diff -urpN -X /home/fletch/.diff.exclude 480-implicit_huge_pages/arch/x86_64/kernel/traps.c 490-amd_sysrq_t/arch/x86_64/kernel/traps.c
--- 480-implicit_huge_pages/arch/x86_64/kernel/traps.c	Mon Nov 17 18:29:25 2003
+++ 490-amd_sysrq_t/arch/x86_64/kernel/traps.c	Thu Dec 11 10:33:19 2003
@@ -218,8 +218,12 @@ void show_stack(struct task_struct *tsk,
 	// debugging aid: "show_stack(NULL, NULL);" prints the
 	// back trace for this cpu.
 
-	if(rsp==NULL)
-		rsp=(unsigned long*)&rsp;
+	if (rsp == NULL) { 
+		if (tsk)
+			rsp = (unsigned long*)tsk->thread.rsp;
+		else
+			rsp=(unsigned long*)&rsp;
+	}
 
 	stack = rsp;
 	for(i=0; i < kstack_depth_to_print; i++) {