Pull define-node-cleanup into release branch

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),