diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 10:37:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 10:37:51 -0500 |
| commit | 3ae0af12b458461f36dfddb26e54056be32928dd (patch) | |
| tree | 063059f24f42506ce2a86374a3b6e2b7a8ae3fcf /arch/powerpc/kernel/traps.c | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
| parent | 7c43ee40ec602db3fa27e6e2d4f092f06ab0901c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 0578f8387603..2020bb7648fb 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
| @@ -129,7 +129,7 @@ int die(const char *str, struct pt_regs *regs, long err) | |||
| 129 | nl = 1; | 129 | nl = 1; |
| 130 | #endif | 130 | #endif |
| 131 | #ifdef CONFIG_PPC64 | 131 | #ifdef CONFIG_PPC64 |
| 132 | switch (systemcfg->platform) { | 132 | switch (_machine) { |
| 133 | case PLATFORM_PSERIES: | 133 | case PLATFORM_PSERIES: |
| 134 | printk("PSERIES "); | 134 | printk("PSERIES "); |
| 135 | nl = 1; | 135 | nl = 1; |