diff options
-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 858748eaa144..a8f541b8fe9f 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c | |||
@@ -238,11 +238,11 @@ static void vfp_panic(char *reason, u32 inst) | |||
238 | { | 238 | { |
239 | int i; | 239 | int i; |
240 | 240 | ||
241 | printk(KERN_ERR "VFP: Error: %s\n", reason); | 241 | pr_err("VFP: Error: %s\n", reason); |
242 | printk(KERN_ERR "VFP: EXC 0x%08x SCR 0x%08x INST 0x%08x\n", | 242 | pr_err("VFP: EXC 0x%08x SCR 0x%08x INST 0x%08x\n", |
243 | fmrx(FPEXC), fmrx(FPSCR), inst); | 243 | fmrx(FPEXC), fmrx(FPSCR), inst); |
244 | for (i = 0; i < 32; i += 2) | 244 | for (i = 0; i < 32; i += 2) |
245 | printk(KERN_ERR "VFP: s%2u: 0x%08x s%2u: 0x%08x\n", | 245 | pr_err("VFP: s%2u: 0x%08x s%2u: 0x%08x\n", |
246 | i, vfp_get_float(i), i+1, vfp_get_float(i+1)); | 246 | i, vfp_get_float(i), i+1, vfp_get_float(i+1)); |
247 | } | 247 | } |
248 | 248 | ||
@@ -446,7 +446,7 @@ static int vfp_pm_suspend(void) | |||
446 | 446 | ||
447 | /* if vfp is on, then save state for resumption */ | 447 | /* if vfp is on, then save state for resumption */ |
448 | if (fpexc & FPEXC_EN) { | 448 | if (fpexc & FPEXC_EN) { |
449 | printk(KERN_DEBUG "%s: saving vfp state\n", __func__); | 449 | pr_debug("%s: saving vfp state\n", __func__); |
450 | vfp_save_state(&ti->vfpstate, fpexc); | 450 | vfp_save_state(&ti->vfpstate, fpexc); |
451 | 451 | ||
452 | /* disable, just in case */ | 452 | /* disable, just in case */ |
@@ -571,18 +571,18 @@ static int __init vfp_init(void) | |||
571 | barrier(); | 571 | barrier(); |
572 | vfp_vector = vfp_null_entry; | 572 | vfp_vector = vfp_null_entry; |
573 | 573 | ||
574 | printk(KERN_INFO "VFP support v0.3: "); | 574 | pr_info("VFP support v0.3: "); |
575 | if (VFP_arch) | 575 | if (VFP_arch) |
576 | printk("not present\n"); | 576 | pr_cont("not present\n"); |
577 | else if (vfpsid & FPSID_NODOUBLE) { | 577 | else if (vfpsid & FPSID_NODOUBLE) { |
578 | printk("no double precision support\n"); | 578 | pr_cont("no double precision support\n"); |
579 | } else { | 579 | } else { |
580 | hotcpu_notifier(vfp_hotplug, 0); | 580 | hotcpu_notifier(vfp_hotplug, 0); |
581 | 581 | ||
582 | smp_call_function(vfp_enable, NULL, 1); | 582 | smp_call_function(vfp_enable, NULL, 1); |
583 | 583 | ||
584 | VFP_arch = (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT; /* Extract the architecture version */ | 584 | VFP_arch = (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT; /* Extract the architecture version */ |
585 | printk("implementor %02x architecture %d part %02x variant %x rev %x\n", | 585 | pr_cont("implementor %02x architecture %d part %02x variant %x rev %x\n", |
586 | (vfpsid & FPSID_IMPLEMENTER_MASK) >> FPSID_IMPLEMENTER_BIT, | 586 | (vfpsid & FPSID_IMPLEMENTER_MASK) >> FPSID_IMPLEMENTER_BIT, |
587 | (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT, | 587 | (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT, |
588 | (vfpsid & FPSID_PART_MASK) >> FPSID_PART_BIT, | 588 | (vfpsid & FPSID_PART_MASK) >> FPSID_PART_BIT, |