Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / kernel / time / clockevents.c

diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 16c027e9cc730a38d1bb97da89dd9f30c4557145..8c0e4092f661824edf50a85342284d9ddcb03e6b 100644 (file)
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -463,6 +463,12 @@ void clockevents_register_device(struct clock_event_device *dev)
                dev->cpumask = cpumask_of(smp_processor_id());
        }
 
+       if (dev->cpumask == cpu_all_mask) {
+               WARN(1, "%s cpumask == cpu_all_mask, using cpu_possible_mask instead\n",
+                    dev->name);
+               dev->cpumask = cpu_possible_mask;
+       }
+
        raw_spin_lock_irqsave(&clockevents_lock, flags);
 
        list_add(&dev->list, &clockevent_devices);