diff options
Diffstat (limited to 'arch/microblaze/kernel/cpu/cpuinfo.c')
-rw-r--r-- | arch/microblaze/kernel/cpu/cpuinfo.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/microblaze/kernel/cpu/cpuinfo.c b/arch/microblaze/kernel/cpu/cpuinfo.c index eab6abf5652e..0b2299bcb948 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo.c +++ b/arch/microblaze/kernel/cpu/cpuinfo.c | |||
@@ -68,31 +68,30 @@ void __init setup_cpuinfo(void) | |||
68 | 68 | ||
69 | cpu = (struct device_node *) of_find_node_by_type(NULL, "cpu"); | 69 | cpu = (struct device_node *) of_find_node_by_type(NULL, "cpu"); |
70 | if (!cpu) | 70 | if (!cpu) |
71 | printk(KERN_ERR "You don't have cpu!!!\n"); | 71 | pr_err("You don't have cpu!!!\n"); |
72 | 72 | ||
73 | printk(KERN_INFO "%s: initialising\n", __func__); | 73 | pr_info("%s: initialising\n", __func__); |
74 | 74 | ||
75 | switch (cpu_has_pvr()) { | 75 | switch (cpu_has_pvr()) { |
76 | case 0: | 76 | case 0: |
77 | printk(KERN_WARNING | 77 | pr_warn("%s: No PVR support. Using static CPU info from FDT\n", |
78 | "%s: No PVR support. Using static CPU info from FDT\n", | ||
79 | __func__); | 78 | __func__); |
80 | set_cpuinfo_static(&cpuinfo, cpu); | 79 | set_cpuinfo_static(&cpuinfo, cpu); |
81 | break; | 80 | break; |
82 | /* FIXME I found weird behavior with MB 7.00.a/b 7.10.a | 81 | /* FIXME I found weird behavior with MB 7.00.a/b 7.10.a |
83 | * please do not use FULL PVR with MMU */ | 82 | * please do not use FULL PVR with MMU */ |
84 | case 1: | 83 | case 1: |
85 | printk(KERN_INFO "%s: Using full CPU PVR support\n", | 84 | pr_info("%s: Using full CPU PVR support\n", |
86 | __func__); | 85 | __func__); |
87 | set_cpuinfo_static(&cpuinfo, cpu); | 86 | set_cpuinfo_static(&cpuinfo, cpu); |
88 | set_cpuinfo_pvr_full(&cpuinfo, cpu); | 87 | set_cpuinfo_pvr_full(&cpuinfo, cpu); |
89 | break; | 88 | break; |
90 | default: | 89 | default: |
91 | printk(KERN_WARNING "%s: Unsupported PVR setting\n", __func__); | 90 | pr_warn("%s: Unsupported PVR setting\n", __func__); |
92 | set_cpuinfo_static(&cpuinfo, cpu); | 91 | set_cpuinfo_static(&cpuinfo, cpu); |
93 | } | 92 | } |
94 | 93 | ||
95 | if (cpuinfo.mmu_privins) | 94 | if (cpuinfo.mmu_privins) |
96 | printk(KERN_WARNING "%s: Stream instructions enabled" | 95 | pr_warn("%s: Stream instructions enabled" |
97 | " - USERSPACE CAN LOCK THIS KERNEL!\n", __func__); | 96 | " - USERSPACE CAN LOCK THIS KERNEL!\n", __func__); |
98 | } | 97 | } |