diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-09-15 17:00:10 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-15 17:00:10 -0700 |
| commit | 55642d36cd0f626c614f6dfa1151a5af1ff84f36 (patch) | |
| tree | 2f167337a389371f21a5f980f8fddc3110e11c10 /drivers/char/mmtimer.c | |
| parent | 24ee0a6d7b0a52b140c880aae24c255de3b4a9a1 (diff) | |
| download | kernel_samsung_espresso10-55642d36cd0f626c614f6dfa1151a5af1ff84f36.zip kernel_samsung_espresso10-55642d36cd0f626c614f6dfa1151a5af1ff84f36.tar.gz kernel_samsung_espresso10-55642d36cd0f626c614f6dfa1151a5af1ff84f36.tar.bz2 | |
[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/mmtimer.c')
| -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 1200618..78c89a3 100644 --- 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; @@ -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 */ |