Commit a095070f authored by Linus Torvalds's avatar Linus Torvalds

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

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents a853f20d 61642e3e
......@@ -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]);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment