diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-21 14:55:09 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-21 14:55:09 -0500 |
| commit | 57550b27ff5a13b00370fbfa34f2471c3456a41d (patch) | |
| tree | 09fbe86a7454b109821ae21a8f285d1f764eeaa8 /arch/ia64/kernel/mca.c | |
| parent | bfe085f62f98a49e1b864e4950389c7205174e4f (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge commit 'v2.6.28-rc6' into x86/urgent
Diffstat (limited to 'arch/ia64/kernel/mca.c')
| -rw-r--r-- | arch/ia64/kernel/mca.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index 7dd96c127177..bab1de2d2f6a 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c | |||
| @@ -1139,7 +1139,7 @@ ia64_mca_modify_original_stack(struct pt_regs *regs, | |||
| 1139 | return previous_current; | 1139 | return previous_current; |
| 1140 | 1140 | ||
| 1141 | no_mod: | 1141 | no_mod: |
| 1142 | printk(KERN_INFO "cpu %d, %s %s, original stack not modified\n", | 1142 | mprintk(KERN_INFO "cpu %d, %s %s, original stack not modified\n", |
| 1143 | smp_processor_id(), type, msg); | 1143 | smp_processor_id(), type, msg); |
| 1144 | return previous_current; | 1144 | return previous_current; |
| 1145 | } | 1145 | } |