diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-28 13:24:06 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-28 13:24:06 -0700 |
| commit | a1e78db3f54d3481726ed2d3d58d8ad5b19b13d0 (patch) | |
| tree | 5793f26d8787ee8462a0ac4316b4a07d7cfa04af /drivers/char | |
| parent | fbbb0bd1f6eb2d8b28d246a4821453bdc3d01b2f (diff) | |
| parent | 59c422358d6573716f2bf2e78e5b12c20eff5a31 (diff) | |
| download | blackbird-op-linux-a1e78db3f54d3481726ed2d3d58d8ad5b19b13d0.tar.gz blackbird-op-linux-a1e78db3f54d3481726ed2d3d58d8ad5b19b13d0.zip | |
Pull define-node-cleanup into release branch
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/mmtimer.c | 4 | ||||
| -rw-r--r-- | drivers/char/snsc.c | 4 |
2 files changed, 4 insertions, 4 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 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 */ diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c index 261a41bf6d02..a025a89ea70a 100644 --- a/drivers/char/snsc.c +++ b/drivers/char/snsc.c @@ -377,7 +377,7 @@ scdrv_init(void) dev_t first_dev, dev; nasid_t event_nasid = ia64_sn_get_console_nasid(); - if (alloc_chrdev_region(&first_dev, 0, numionodes, + if (alloc_chrdev_region(&first_dev, 0, num_cnodes, SYSCTL_BASENAME) < 0) { printk("%s: failed to register SN system controller device\n", __FUNCTION__); @@ -385,7 +385,7 @@ scdrv_init(void) } snsc_class = class_create(THIS_MODULE, SYSCTL_BASENAME); - for (cnode = 0; cnode < numionodes; cnode++) { + for (cnode = 0; cnode < num_cnodes; cnode++) { geoid = cnodeid_get_geoid(cnode); devnamep = devname; format_module_id(devnamep, geo_module(geoid), |
