---

yaml --- r: 10863 b: refs/heads/master c: 55642d3 h: refs/heads/master i: 10861: 8c306a2 10859: c73265d 10855: 651ee92 10847: d48c789 v: v3
git-mirror · Sep 16, 2005 · cda8df6 · cda8df6
1 parent 0bc81c8
commit cda8df6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24ee0a6d7b0a52b140c880aae24c255de3b4a9a1
+refs/heads/master: 55642d36cd0f626c614f6dfa1151a5af1ff84f36
diff --git a/trunk/drivers/char/mmtimer.c b/trunk/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;
@@ -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 */