4 files changed, 24 insertions, 24 deletions

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index bd7acc71e8a9..0553648b7595 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -202,7 +202,6 @@ char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
                             Boot-time Table Parsing
    -------------------------------------------------------------------------- */
 
-static int total_cpus __initdata;
 static int available_cpus __initdata;
 struct acpi_table_madt *acpi_madt __initdata;
 static u8 has_8259;
@@ -1001,7 +1000,7 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)
         node = pxm_to_node(pxm);
 
         if (node >= MAX_NUMNODES || !node_online(node) ||
-            cpus_empty(node_to_cpumask(node)))
+            cpumask_empty(cpumask_of_node(node)))
                 return AE_OK;
 
         /* We know a gsi to node mapping! */
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index c8adecd5b416..5cfd3d91001a 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -695,32 +695,31 @@ get_target_cpu (unsigned int gsi, int irq)
 #ifdef CONFIG_NUMA
         {
                 int num_cpus, cpu_index, iosapic_index, numa_cpu, i = 0;
-                cpumask_t cpu_mask;
+                const struct cpumask *cpu_mask;
 
                 iosapic_index = find_iosapic(gsi);
                 if (iosapic_index < 0 ||
                     iosapic_lists[iosapic_index].node == MAX_NUMNODES)
                         goto skip_numa_setup;
 
-                cpu_mask = node_to_cpumask(iosapic_lists[iosapic_index].node);
-                cpus_and(cpu_mask, cpu_mask, domain);
-                for_each_cpu_mask(numa_cpu, cpu_mask) {
-                        if (!cpu_online(numa_cpu))
-                                cpu_clear(numa_cpu, cpu_mask);
+                cpu_mask = cpumask_of_node(iosapic_lists[iosapic_index].node);
+                num_cpus = 0;
+                for_each_cpu_and(numa_cpu, cpu_mask, &domain) {
+                        if (cpu_online(numa_cpu))
+                                num_cpus++;
                 }
 
-                num_cpus = cpus_weight(cpu_mask);
-
                 if (!num_cpus)
                         goto skip_numa_setup;
 
                 /* Use irq assignment to distribute across cpus in node */
                 cpu_index = irq % num_cpus;
 
-                for (numa_cpu = first_cpu(cpu_mask) ; i < cpu_index ; i++)
-                        numa_cpu = next_cpu(numa_cpu, cpu_mask);
+                for_each_cpu_and(numa_cpu, cpu_mask, &domain)
+                        if (cpu_online(numa_cpu) && i++ >= cpu_index)
+                                break;
 
-                if (numa_cpu != NR_CPUS)
+                if (numa_cpu < nr_cpu_ids)
                         return cpu_physical_id(numa_cpu);
         }
 skip_numa_setup:
@@ -731,7 +730,7 @@ skip_numa_setup:
          * case of NUMA.)
          */
         do {
-                if (++cpu >= NR_CPUS)
+                if (++cpu >= nr_cpu_ids)
                         cpu = 0;
         } while (!cpu_online(cpu) || !cpu_isset(cpu, domain));
 
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
index 0b6db53fedcf..95ff16cb05d8 100644
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
@@ -112,11 +112,11 @@ void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
         }
 }
 
-bool is_affinity_mask_valid(cpumask_t cpumask)
+bool is_affinity_mask_valid(cpumask_var_t cpumask)
 {
         if (ia64_platform_is("sn2")) {
                 /* Only allow one CPU to be specified in the smp_affinity mask */
-                if (cpus_weight(cpumask) != 1)
+                if (cpumask_weight(cpumask) != 1)
                         return false;
         }
         return true;
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 65c10a42c88f..f0ebb342409d 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -93,13 +93,14 @@ void ia64_account_on_switch(struct task_struct *prev, struct task_struct *next)
         now = ia64_get_itc();
 
         delta_stime = cycle_to_cputime(pi->ac_stime + (now - pi->ac_stamp));
-        account_system_time(prev, 0, delta_stime);
-        account_system_time_scaled(prev, delta_stime);
+        if (idle_task(smp_processor_id()) != prev)
+                account_system_time(prev, 0, delta_stime, delta_stime);
+        else
+                account_idle_time(delta_stime);
 
         if (pi->ac_utime) {
                 delta_utime = cycle_to_cputime(pi->ac_utime);
-                account_user_time(prev, delta_utime);
-                account_user_time_scaled(prev, delta_utime);
+                account_user_time(prev, delta_utime, delta_utime);
         }
 
         pi->ac_stamp = ni->ac_stamp = now;
@@ -122,8 +123,10 @@ void account_system_vtime(struct task_struct *tsk)
         now = ia64_get_itc();
 
         delta_stime = cycle_to_cputime(ti->ac_stime + (now - ti->ac_stamp));
-        account_system_time(tsk, 0, delta_stime);
-        account_system_time_scaled(tsk, delta_stime);
+        if (irq_count() || idle_task(smp_processor_id()) != tsk)
+                account_system_time(tsk, 0, delta_stime, delta_stime);
+        else
+                account_idle_time(delta_stime);
         ti->ac_stime = 0;
 
         ti->ac_stamp = now;
@@ -143,8 +146,7 @@ void account_process_tick(struct task_struct *p, int user_tick)
 
         if (ti->ac_utime) {
                 delta_utime = cycle_to_cputime(ti->ac_utime);
-                account_user_time(p, delta_utime);
-                account_user_time_scaled(p, delta_utime);
+                account_user_time(p, delta_utime, delta_utime);
                 ti->ac_utime = 0;
         }
 }