Pull cpumask into release branch

diff --combined arch/ia64/include/asm/topology.h
index f260dcf215154078bf72752eb7991895a9b03fa8,6fbbf8709e1f60a0e75bc28dea3004b5ef6de203..7b4c8c70b2d18f7949372899ab056f41d913ed6b
--- 1/arch/ia64/include/asm/topology.h
--- 2/arch/ia64/include/asm/topology.h
+++ b/arch/ia64/include/asm/topology.h
@@@ -43,6 -43,11 +43,6 @@@
   */
  #define parent_node(nid) (nid)
  
 -/*
 - * Returns the number of the first CPU on Node 'node'.
 - */
 -#define node_to_first_cpu(node) (cpumask_first(cpumask_of_node(node)))
 -
  /*
   * Determines the node for a given pci bus
   */
@@@ -79,7 -84,7 +79,7 @@@ void build_cpu_to_node_map(void)
        .child                  = NULL,                 \
        .groups                 = NULL,                 \
        .min_interval           = 8,                    \
 -      .max_interval           = 8*(min(num_online_cpus(), 32)), \
 +      .max_interval           = 8*(min(num_online_cpus(), 32U)), \
        .busy_factor            = 64,                   \
        .imbalance_pct          = 125,                  \
        .cache_nice_tries       = 2,                    \
@@@ -112,11 -117,6 +112,6 @@@
  
  extern void arch_fix_phys_package_id(int num, u32 slot);
  
- #define pcibus_to_cpumask(bus)        (pcibus_to_node(bus) == -1 ? \
-                                       CPU_MASK_ALL : \
-                                       node_to_cpumask(pcibus_to_node(bus)) \
-                               )
- 
  #define cpumask_of_pcibus(bus)        (pcibus_to_node(bus) == -1 ?            \
                                 cpu_all_mask :                         \
                                 cpumask_of_node(pcibus_to_node(bus)))

diff --combined arch/ia64/kernel/acpi.c
index bdef2ce38c8b45c3227b7d70673db1bce4deb46f,2f19d91b0b887531bbb6e2301ba80a13806945e9..5510317db37b2a439711bb3fa97d6af0c7cd00bf
--- 1/arch/ia64/kernel/acpi.c
--- 2/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@@ -199,10 -199,6 +199,10 @@@ char *__init __acpi_map_table(unsigned 
        return __va(phys_addr);
  }
  
 +void __init __acpi_unmap_table(char *map, unsigned long size)
 +{
 +}
 +
  /* --------------------------------------------------------------------------
                              Boot-time Table Parsing
     -------------------------------------------------------------------------- */
@@@ -890,7 -886,7 +890,7 @@@ __init void prefill_possible_map(void
                possible, max((possible - available_cpus), 0));
  
        for (i = 0; i < possible; i++)
-               cpu_set(i, cpu_possible_map);
+               set_cpu_possible(i, true);
  }
  
  int acpi_map_lsapic(acpi_handle handle, int *pcpu)
@@@ -928,9 -924,9 +928,9 @@@
        buffer.length = ACPI_ALLOCATE_BUFFER;
        buffer.pointer = NULL;
  
-       cpus_complement(tmp_map, cpu_present_map);
-       cpu = first_cpu(tmp_map);
-       if (cpu >= NR_CPUS)
+       cpumask_complement(&tmp_map, cpu_present_mask);
+       cpu = cpumask_first(&tmp_map);
+       if (cpu >= nr_cpu_ids)
                return -EINVAL;
  
        acpi_map_cpu2node(handle, cpu, physid);

diff --combined arch/ia64/kernel/perfmon.c
index 5c0f408cfd719f02ded2c58dc6ebf2b3c181c7b5,6fc1e638f0eb643ed1652043f8c558f487f33537..8a06dc480594c0d3e93636eccad9ea9316944127
--- 1/arch/ia64/kernel/perfmon.c
--- 2/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@@ -2196,7 -2196,7 +2196,7 @@@ pfmfs_delete_dentry(struct dentry *dent
        return 1;
  }
  
 -static struct dentry_operations pfmfs_dentry_operations = {
 +static const struct dentry_operations pfmfs_dentry_operations = {
        .d_delete = pfmfs_delete_dentry,
  };
  
@@@ -5603,7 -5603,7 +5603,7 @@@ pfm_interrupt_handler(int irq, void *ar
   * /proc/perfmon interface, for debug only
   */
  
- #define PFM_PROC_SHOW_HEADER  ((void *)NR_CPUS+1)
+ #define PFM_PROC_SHOW_HEADER  ((void *)nr_cpu_ids+1)
  
  static void *
  pfm_proc_start(struct seq_file *m, loff_t *pos)
@@@ -5612,7 -5612,7 +5612,7 @@@
                return PFM_PROC_SHOW_HEADER;
        }
  
-       while (*pos <= NR_CPUS) {
+       while (*pos <= nr_cpu_ids) {
                if (cpu_online(*pos - 1)) {
                        return (void *)*pos;
                }