diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 18:07:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 18:07:40 -0500 |
| commit | 906430a99ec8ca48f264e835a264df89fc50dfd4 (patch) | |
| tree | 58ed30debffc01a06df2a6a617daa6d33683441b /arch/ia64/kernel/mca.c | |
| parent | ba721d318b24154eb7806a8673d3fc030fd39f7e (diff) | |
| parent | 0090d481ee4c5d9a54ae2c457ab3ef9111dd4a91 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] xen: fix xen_get_eflags.
[IA64] ia64/pv_ops/pv_cpu_ops: fix _IA64_REG_IP case.
[IA64] remove duplicate include iommu.h
[IA64] use mprintk instead of printk, in ia64_mca_modify_original_stack
[IA64] Rationalize kernel mode alignment checking
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 | } |