|
@@ -27,6 +27,9 @@
|
|
|
*
|
|
|
* http://www.unisys.com
|
|
|
*/
|
|
|
+
|
|
|
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
+
|
|
|
#include <linux/notifier.h>
|
|
|
#include <linux/spinlock.h>
|
|
|
#include <linux/cpumask.h>
|
|
@@ -223,9 +226,9 @@ static int parse_unisys_oem(char *oemptr)
|
|
|
mip_addr = val;
|
|
|
mip = (struct mip_reg *)val;
|
|
|
mip_reg = __va(mip);
|
|
|
- pr_debug("es7000_mipcfg: host_reg = 0x%lx \n",
|
|
|
+ pr_debug("host_reg = 0x%lx\n",
|
|
|
(unsigned long)host_reg);
|
|
|
- pr_debug("es7000_mipcfg: mip_reg = 0x%lx \n",
|
|
|
+ pr_debug("mip_reg = 0x%lx\n",
|
|
|
(unsigned long)mip_reg);
|
|
|
success++;
|
|
|
break;
|
|
@@ -401,7 +404,7 @@ static void es7000_enable_apic_mode(void)
|
|
|
if (!es7000_plat)
|
|
|
return;
|
|
|
|
|
|
- printk(KERN_INFO "ES7000: Enabling APIC mode.\n");
|
|
|
+ pr_info("Enabling APIC mode.\n");
|
|
|
memset(&es7000_mip_reg, 0, sizeof(struct mip_reg));
|
|
|
es7000_mip_reg.off_0x00 = MIP_SW_APIC;
|
|
|
es7000_mip_reg.off_0x38 = MIP_VALID;
|
|
@@ -514,8 +517,7 @@ static void es7000_setup_apic_routing(void)
|
|
|
{
|
|
|
int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id());
|
|
|
|
|
|
- printk(KERN_INFO
|
|
|
- "Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n",
|
|
|
+ pr_info("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n",
|
|
|
(apic_version[apic] == 0x14) ?
|
|
|
"Physical Cluster" : "Logical Cluster",
|
|
|
nr_ioapics, cpumask_bits(es7000_target_cpus())[0]);
|