Merge bk://bk.arm.linux.org.uk/linux-2.6-smp

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://bk.arm.linux.org.uk/linux-2.6-smp
into ppc970.osdl.org:/home/torvalds/v2.6/linux
a095070f · Linus Torvalds · a853f20d · 61642e3e · a095070f
Commit a095070f authored Jan 16, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/arm/kernel/time.c arch/arm/kernel/time.c +1 -1

No files found.
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -63,7 +63,7 @@ unsigned long profile_pc(struct pt_regs *regs)
 	unsigned long fp, pc = instruction_pointer(regs);

 	if (in_lock_functions(pc)) {
-		fp = thread_saved_fp(current);
+		fp = regs->ARM_fp;
 		pc = pc_pointer(((unsigned long *)fp)[-1]);
 	}