diff options
author | Tony Luck <tony.luck@intel.com> | 2005-09-15 20:00:10 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-09-15 20:00:10 -0400 |
commit | 55642d36cd0f626c614f6dfa1151a5af1ff84f36 (patch) | |
tree | 2f167337a389371f21a5f980f8fddc3110e11c10 /drivers/char | |
parent | 24ee0a6d7b0a52b140c880aae24c255de3b4a9a1 (diff) |
[IA64] Two more uses of cpuid_to_cnodeid() must go.
s/cpuid_to_cnodeid/cpu_to_node/
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/mmtimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c index 12006182f575..78c89a3e7825 100644 --- a/drivers/char/mmtimer.c +++ b/drivers/char/mmtimer.c | |||
@@ -441,7 +441,7 @@ static irqreturn_t | |||
441 | mmtimer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 441 | mmtimer_interrupt(int irq, void *dev_id, struct pt_regs *regs) |
442 | { | 442 | { |
443 | int i; | 443 | int i; |
444 | mmtimer_t *base = timers + cpuid_to_cnodeid(smp_processor_id()) * | 444 | mmtimer_t *base = timers + cpu_to_node(smp_processor_id()) * |
445 | NUM_COMPARATORS; | 445 | NUM_COMPARATORS; |
446 | unsigned long expires = 0; | 446 | unsigned long expires = 0; |
447 | int result = IRQ_NONE; | 447 | int result = IRQ_NONE; |
@@ -608,7 +608,7 @@ static int sgi_timer_set(struct k_itimer *timr, int flags, | |||
608 | */ | 608 | */ |
609 | preempt_disable(); | 609 | preempt_disable(); |
610 | 610 | ||
611 | nodeid = cpuid_to_cnodeid(smp_processor_id()); | 611 | nodeid = cpu_to_node(smp_processor_id()); |
612 | base = timers + nodeid * NUM_COMPARATORS; | 612 | base = timers + nodeid * NUM_COMPARATORS; |
613 | retry: | 613 | retry: |
614 | /* Don't use an allocated timer, or a deleted one that's pending */ | 614 | /* Don't use an allocated timer, or a deleted one that's pending */ |