2 files changed, 4 insertions, 17 deletions

diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 09b82093bc75..2250c654eacc 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -974,15 +974,12 @@ void __init setup_boot_APIC_clock (void)
  */
 void __cpuinit check_boot_apic_timer_broadcast(void)
 {
-        struct clock_event_device *levt = &per_cpu(lapic_events, boot_cpu_id);
-
         if (!disable_apic_timer ||
             (lapic_clockevent.features & CLOCK_EVT_FEAT_DUMMY))
                 return;
 
         printk(KERN_INFO "AMD C1E detected late. Force timer broadcast.\n");
         lapic_clockevent.features |= CLOCK_EVT_FEAT_DUMMY;
-        levt->features |= CLOCK_EVT_FEAT_DUMMY;
 
         local_irq_enable();
         clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_FORCE, &boot_cpu_id);
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index fab9dd8bbd6b..8cfb8b2ce773 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -222,20 +222,8 @@ static void tick_do_broadcast_on_off(void *why)
         if (!dev || !(dev->features & CLOCK_EVT_FEAT_C3STOP))
                 goto out;
 
-        /*
-         * Defect device ?
-         */
-        if (!tick_device_is_functional(dev)) {
-                /*
-                 * AMD C1E wreckage fixup:
-                 *
-                 * Device was registered functional in the first
-                 * place. Now the secondary CPU detected the C1E
-                 * misfeature and notifies us to fix it up
-                 */
-                if (*reason != CLOCK_EVT_NOTIFY_BROADCAST_FORCE)
-                        goto out;
-        }
+        if (!tick_device_is_functional(dev))
+                goto out;
 
         switch (*reason) {
         case CLOCK_EVT_NOTIFY_BROADCAST_ON:
@@ -246,6 +234,8 @@ static void tick_do_broadcast_on_off(void *why)
                                 clockevents_set_mode(dev,
                                                      CLOCK_EVT_MODE_SHUTDOWN);
                 }
+                if (*reason == CLOCK_EVT_NOTIFY_BROADCAST_FORCE)
+                        dev->features |= CLOCK_EVT_FEAT_DUMMY;
                 break;
         case CLOCK_EVT_NOTIFY_BROADCAST_OFF:
                 if (cpu_isset(cpu, tick_broadcast_mask)) {