diff options
| author | Scott Wood <scottwood@freescale.com> | 2007-09-28 04:38:55 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-03 11:48:44 +1000 |
| commit | 0de2d820067e03ca93f6bf5320d362d5262fb7a3 (patch) | |
| tree | 5f03f6c0bd4c040d436ad42cf6ccc2f24cba32c2 /arch/powerpc/kernel | |
| parent | 3eb523b939d59fd90518188750c26df5d357478f (diff) | |
| download | op-kernel-dev-0de2d820067e03ca93f6bf5320d362d5262fb7a3.zip op-kernel-dev-0de2d820067e03ca93f6bf5320d362d5262fb7a3.tar.gz | |
[POWERPC] Make instruction dumping work in real mode
On non-book-E, exceptions execute in real mode. If a fault happens
that leads to a register dump, the kernel currently prints XXXXXXXX
because it doesn't realize that PC is a physical address.
This patch checks whether instruction address translation is turned
on, and if not converts PC into a virtual address.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/process.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 57c589c..588c0cb 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -354,6 +354,14 @@ static void show_instructions(struct pt_regs *regs) if (!(i % 8)) printk("\n"); +#if !defined(CONFIG_BOOKE) + /* If executing with the IMMU off, adjust pc rather + * than print XXXXXXXX. + */ + if (!(regs->msr & MSR_IR)) + pc = (unsigned long)phys_to_virt(pc); +#endif + /* We use __get_user here *only* to avoid an OOPS on a * bad address because the pc *should* only be a * kernel address. |
