manual update from upstream:

[powerpc.git] / drivers / char / mmtimer.c

diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index 58eddfd..78c89a3 100644 (file)
--- a/drivers/char/mmtimer.c
+++ b/drivers/char/mmtimer.c
@@ -441,7 +441,7 @@ static irqreturn_t
 mmtimer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
        int i;
-       mmtimer_t *base = timers + cpuid_to_cnodeid(smp_processor_id()) *
+       mmtimer_t *base = timers + cpu_to_node(smp_processor_id()) *
                                                NUM_COMPARATORS;
        unsigned long expires = 0;
        int result = IRQ_NONE;
@@ -485,7 +485,7 @@ void mmtimer_tasklet(unsigned long data) {
                goto out;
        t->it_overrun = 0;
 
-       if (tasklist_lock.write_lock || posix_timer_event(t, 0) != 0) {
+       if (posix_timer_event(t, 0) != 0) {
 
                // printk(KERN_WARNING "mmtimer: cannot deliver signal.\n");
 
@@ -608,7 +608,7 @@ static int sgi_timer_set(struct k_itimer *timr, int flags,
         */
        preempt_disable();
 
-       nodeid =  cpuid_to_cnodeid(smp_processor_id());
+       nodeid =  cpu_to_node(smp_processor_id());
        base = timers + nodeid * NUM_COMPARATORS;
 retry:
        /* Don't use an allocated timer, or a deleted one that's pending */