#define PANIC_TIMEOUT 5 /* 5 seconds */
 
-static atomic_t mce_paniced;
+static atomic_t mce_panicked;
 
 static int fake_panic;
-static atomic_t mce_fake_paniced;
+static atomic_t mce_fake_panicked;
 
 /* Panic in progress. Enable interrupts and wait for final IPI */
 static void wait_for_panic(void)
                /*
                 * Make sure only one CPU runs in machine check panic
                 */
-               if (atomic_inc_return(&mce_paniced) > 1)
+               if (atomic_inc_return(&mce_panicked) > 1)
                        wait_for_panic();
                barrier();
 
                console_verbose();
        } else {
                /* Don't log too much for fake panic */
-               if (atomic_inc_return(&mce_fake_paniced) > 1)
+               if (atomic_inc_return(&mce_fake_panicked) > 1)
                        return;
        }
        /* First print corrected ones that are still unlogged */
         * might have been modified by someone else.
         */
        rmb();
-       if (atomic_read(&mce_paniced))
+       if (atomic_read(&mce_panicked))
                wait_for_panic();
        if (!mca_cfg.monarch_timeout)
                goto out;
 static void mce_reset(void)
 {
        cpu_missing = 0;
-       atomic_set(&mce_fake_paniced, 0);
+       atomic_set(&mce_fake_panicked, 0);
        atomic_set(&mce_executing, 0);
        atomic_set(&mce_callin, 0);
        atomic_set(&global_nwo, 0);