tile: Use the more common pr_warn instead of pr_warning

[deliverable/linux.git] / arch / tile / kernel / smpboot.c

diff --git a/arch/tile/kernel/smpboot.c b/arch/tile/kernel/smpboot.c
index 732e9d1386618066ad8cb294e0155a6fcd70417d..20d52a98e1716be9a2ea5a58353ec78d6a44a6b9 100644 (file)
--- a/arch/tile/kernel/smpboot.c
+++ b/arch/tile/kernel/smpboot.c
@@ -41,7 +41,7 @@ void __init smp_prepare_boot_cpu(void)
        int cpu = smp_processor_id();
        set_cpu_online(cpu, 1);
        set_cpu_present(cpu, 1);
-       __get_cpu_var(cpu_state) = CPU_ONLINE;
+       __this_cpu_write(cpu_state, CPU_ONLINE);
 
        init_messaging();
 }
@@ -127,8 +127,7 @@ static __init int reset_init_affinity(void)
 {
        long rc = sched_setaffinity(current->pid, &init_affinity);
        if (rc != 0)
-               pr_warning("couldn't reset init affinity (%ld)\n",
-                      rc);
+               pr_warn("couldn't reset init affinity (%ld)\n", rc);
        return 0;
 }
 late_initcall(reset_init_affinity);
@@ -158,7 +157,7 @@ static void start_secondary(void)
        /* printk(KERN_DEBUG "Initializing CPU#%d\n", cpuid); */
 
        /* Initialize the current asid for our first page table. */
-       __get_cpu_var(current_asid) = min_asid;
+       __this_cpu_write(current_asid, min_asid);
 
        /* Set up this thread as another owner of the init_mm */
        atomic_inc(&init_mm.mm_count);
@@ -174,7 +173,7 @@ static void start_secondary(void)
        /* Indicate that we're ready to come up. */
        /* Must not do this before we're ready to receive messages */
        if (cpumask_test_and_set_cpu(cpuid, &cpu_started)) {
-               pr_warning("CPU#%d already started!\n", cpuid);
+               pr_warn("CPU#%d already started!\n", cpuid);
                for (;;)
                        local_irq_enable();
        }
@@ -201,7 +200,7 @@ void online_secondary(void)
        notify_cpu_starting(smp_processor_id());
 
        set_cpu_online(smp_processor_id(), 1);
-       __get_cpu_var(cpu_state) = CPU_ONLINE;
+       __this_cpu_write(cpu_state, CPU_ONLINE);
 
        /* Set up tile-specific state for this cpu. */
        setup_cpu(0);