diff --git a/[refs] b/[refs]
index 704482db0853..dd4ed5b99bbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2502b667ea835ee16685c74b2a0d89ba8afe117a
+refs/heads/master: a4c8b9159000018b0c641b844795a4de4e954582
diff --git a/trunk/arch/m68knommu/kernel/traps.c b/trunk/arch/m68knommu/kernel/traps.c
index 9c943a4accc0..437a061d8b94 100644
--- a/trunk/arch/m68knommu/kernel/traps.c
+++ b/trunk/arch/m68knommu/kernel/traps.c
@@ -80,7 +80,7 @@ void die_if_kernel(char *str, struct pt_regs *fp, int nr)
 
 	printk(KERN_EMERG "Process %s (pid: %d, stackpage=%08lx)\n",
 		current->comm, current->pid, PAGE_SIZE+(unsigned long)current);
-	show_stack(NULL, (unsigned long *)fp);
+	show_stack(NULL, (unsigned long *)(fp + 1));
 	add_taint(TAINT_DIE);
 	do_exit(SIGSEGV);
 }