diff options
Diffstat (limited to 'arch/arm/vfp/vfpmodule.c')
-rw-r--r-- | arch/arm/vfp/vfpmodule.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index b0197b2c857d..586961929e96 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c | |||
@@ -241,11 +241,11 @@ static void vfp_panic(char *reason, u32 inst) | |||
241 | { | 241 | { |
242 | int i; | 242 | int i; |
243 | 243 | ||
244 | printk(KERN_ERR "VFP: Error: %s\n", reason); | 244 | pr_err("VFP: Error: %s\n", reason); |
245 | printk(KERN_ERR "VFP: EXC 0x%08x SCR 0x%08x INST 0x%08x\n", | 245 | pr_err("VFP: EXC 0x%08x SCR 0x%08x INST 0x%08x\n", |
246 | fmrx(FPEXC), fmrx(FPSCR), inst); | 246 | fmrx(FPEXC), fmrx(FPSCR), inst); |
247 | for (i = 0; i < 32; i += 2) | 247 | for (i = 0; i < 32; i += 2) |
248 | printk(KERN_ERR "VFP: s%2u: 0x%08x s%2u: 0x%08x\n", | 248 | pr_err("VFP: s%2u: 0x%08x s%2u: 0x%08x\n", |
249 | i, vfp_get_float(i), i+1, vfp_get_float(i+1)); | 249 | i, vfp_get_float(i), i+1, vfp_get_float(i+1)); |
250 | } | 250 | } |
251 | 251 | ||
@@ -452,7 +452,7 @@ static int vfp_pm_suspend(void) | |||
452 | 452 | ||
453 | /* if vfp is on, then save state for resumption */ | 453 | /* if vfp is on, then save state for resumption */ |
454 | if (fpexc & FPEXC_EN) { | 454 | if (fpexc & FPEXC_EN) { |
455 | printk(KERN_DEBUG "%s: saving vfp state\n", __func__); | 455 | pr_debug("%s: saving vfp state\n", __func__); |
456 | vfp_save_state(&ti->vfpstate, fpexc); | 456 | vfp_save_state(&ti->vfpstate, fpexc); |
457 | 457 | ||
458 | /* disable, just in case */ | 458 | /* disable, just in case */ |
@@ -664,16 +664,16 @@ static int __init vfp_init(void) | |||
664 | barrier(); | 664 | barrier(); |
665 | vfp_vector = vfp_null_entry; | 665 | vfp_vector = vfp_null_entry; |
666 | 666 | ||
667 | printk(KERN_INFO "VFP support v0.3: "); | 667 | pr_info("VFP support v0.3: "); |
668 | if (VFP_arch) | 668 | if (VFP_arch) |
669 | printk("not present\n"); | 669 | pr_cont("not present\n"); |
670 | else if (vfpsid & FPSID_NODOUBLE) { | 670 | else if (vfpsid & FPSID_NODOUBLE) { |
671 | printk("no double precision support\n"); | 671 | pr_cont("no double precision support\n"); |
672 | } else { | 672 | } else { |
673 | hotcpu_notifier(vfp_hotplug, 0); | 673 | hotcpu_notifier(vfp_hotplug, 0); |
674 | 674 | ||
675 | VFP_arch = (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT; /* Extract the architecture version */ | 675 | VFP_arch = (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT; /* Extract the architecture version */ |
676 | printk("implementor %02x architecture %d part %02x variant %x rev %x\n", | 676 | pr_cont("implementor %02x architecture %d part %02x variant %x rev %x\n", |
677 | (vfpsid & FPSID_IMPLEMENTER_MASK) >> FPSID_IMPLEMENTER_BIT, | 677 | (vfpsid & FPSID_IMPLEMENTER_MASK) >> FPSID_IMPLEMENTER_BIT, |
678 | (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT, | 678 | (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT, |
679 | (vfpsid & FPSID_PART_MASK) >> FPSID_PART_BIT, | 679 | (vfpsid & FPSID_PART_MASK) >> FPSID_PART_BIT, |