Merge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (682 commits)
  percpu: fix spurious alignment WARN in legacy SMP percpu allocator
  percpu: generalize embedding first chunk setup helper
  percpu: more flexibility for @dyn_size of pcpu_setup_first_chunk()
  percpu: make x86 addr <-> pcpu ptr conversion macros generic
  linker script: define __per_cpu_load on all SMP capable archs
  x86: UV: remove uv_flush_tlb_others() WARN_ON
  percpu: finer grained locking to break deadlock and allow atomic free
  percpu: move fully free chunk reclamation into a work
  percpu: move chunk area map extension out of area allocation
  percpu: replace pcpu_realloc() with pcpu_mem_alloc() and pcpu_mem_free()
  x86, percpu: setup reserved percpu area for x86_64
  percpu, module: implement reserved allocation and use it for module percpu variables
  percpu: add an indirection ptr for chunk page map access
  x86: make embedding percpu allocator return excessive free space
  percpu: use negative for auto for pcpu_setup_first_chunk() arguments
  percpu: improve first chunk initial area map handling
  percpu: cosmetic renames in pcpu_setup_first_chunk()
  percpu: clean up percpu constants
  x86: un-__init fill_pud/pmd/pte
  x86: remove vestigial fix_ioremap prototypes
  ...

Manually merge conflicts in arch/ia64/kernel/irq_ia64.c

4 files changed, 28 insertions, 20 deletions

diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c
index fac43fd6fc87..6a843f7350ab 100644
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ne3210.c
@@ -150,7 +150,8 @@ static int __init ne3210_eisa_probe (struct device *device)
                 if (phys_mem < virt_to_phys(high_memory)) {
                         printk(KERN_CRIT "ne3210.c: Card RAM overlaps with normal memory!!!\n");
                         printk(KERN_CRIT "ne3210.c: Use EISA SCU to set card memory below 1MB,\n");
-                        printk(KERN_CRIT "ne3210.c: or to an address above 0x%lx.\n", virt_to_phys(high_memory));
+                        printk(KERN_CRIT "ne3210.c: or to an address above 0x%llx.\n",
+                                (u64)virt_to_phys(high_memory));
                         printk(KERN_CRIT "ne3210.c: Driver NOT installed.\n");
                         retval = -EINVAL;
                         goto out3;
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 6eff9ca6c6c8..00c23b1babca 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -894,20 +894,27 @@ static void efx_fini_io(struct efx_nic *efx)
  * interrupts across them. */
 static int efx_wanted_rx_queues(void)
 {
-        cpumask_t core_mask;
+        cpumask_var_t core_mask;
         int count;
         int cpu;
 
-        cpus_clear(core_mask);
+        if (!alloc_cpumask_var(&core_mask, GFP_KERNEL)) {
+                printk(KERN_WARNING
+                       "efx.c: allocation failure, irq balancing hobbled\n");
+                return 1;
+        }
+
+        cpumask_clear(core_mask);
         count = 0;
         for_each_online_cpu(cpu) {
-                if (!cpu_isset(cpu, core_mask)) {
+                if (!cpumask_test_cpu(cpu, core_mask)) {
                         ++count;
-                        cpus_or(core_mask, core_mask,
-                                topology_core_siblings(cpu));
+                        cpumask_or(core_mask, core_mask,
+                                   topology_core_cpumask(cpu));
                 }
         }
 
+        free_cpumask_var(core_mask);
         return count;
 }
 
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 23a1b148d5b2..d4629ab2c614 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -340,10 +340,10 @@ static int falcon_alloc_special_buffer(struct efx_nic *efx,
         nic_data->next_buffer_table += buffer->entries;
 
         EFX_LOG(efx, "allocating special buffers %d-%d at %llx+%x "
-                "(virt %p phys %lx)\n", buffer->index,
+                "(virt %p phys %llx)\n", buffer->index,
                 buffer->index + buffer->entries - 1,
-                (unsigned long long)buffer->dma_addr, len,
-                buffer->addr, virt_to_phys(buffer->addr));
+                (u64)buffer->dma_addr, len,
+                buffer->addr, (u64)virt_to_phys(buffer->addr));
 
         return 0;
 }
@@ -355,10 +355,10 @@ static void falcon_free_special_buffer(struct efx_nic *efx,
                 return;
 
         EFX_LOG(efx, "deallocating special buffers %d-%d at %llx+%x "
-                "(virt %p phys %lx)\n", buffer->index,
+                "(virt %p phys %llx)\n", buffer->index,
                 buffer->index + buffer->entries - 1,
-                (unsigned long long)buffer->dma_addr, buffer->len,
-                buffer->addr, virt_to_phys(buffer->addr));
+                (u64)buffer->dma_addr, buffer->len,
+                buffer->addr, (u64)virt_to_phys(buffer->addr));
 
         pci_free_consistent(efx->pci_dev, buffer->len, buffer->addr,
                             buffer->dma_addr);
@@ -2357,10 +2357,10 @@ int falcon_probe_port(struct efx_nic *efx)
                                  FALCON_MAC_STATS_SIZE);
         if (rc)
                 return rc;
-        EFX_LOG(efx, "stats buffer at %llx (virt %p phys %lx)\n",
-                (unsigned long long)efx->stats_buffer.dma_addr,
+        EFX_LOG(efx, "stats buffer at %llx (virt %p phys %llx)\n",
+                (u64)efx->stats_buffer.dma_addr,
                 efx->stats_buffer.addr,
-                virt_to_phys(efx->stats_buffer.addr));
+                (u64)virt_to_phys(efx->stats_buffer.addr));
 
         return 0;
 }
@@ -2935,9 +2935,9 @@ int falcon_probe_nic(struct efx_nic *efx)
                 goto fail4;
         BUG_ON(efx->irq_status.dma_addr & 0x0f);
 
-        EFX_LOG(efx, "INT_KER at %llx (virt %p phys %lx)\n",
-                (unsigned long long)efx->irq_status.dma_addr,
-                efx->irq_status.addr, virt_to_phys(efx->irq_status.addr));
+        EFX_LOG(efx, "INT_KER at %llx (virt %p phys %llx)\n",
+                (u64)efx->irq_status.dma_addr,
+                efx->irq_status.addr, (u64)virt_to_phys(efx->irq_status.addr));
 
         falcon_probe_spi_devices(efx);
 
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
index 5b9f1e06ebf6..a54a67c425c8 100644
--- a/drivers/net/wireless/arlan-main.c
+++ b/drivers/net/wireless/arlan-main.c
@@ -1085,8 +1085,8 @@ static int __init arlan_probe_here(struct net_device *dev,
         if (arlan_check_fingerprint(memaddr))
                 return -ENODEV;
 
-        printk(KERN_NOTICE "%s: Arlan found at %x, \n ", dev->name, 
-               (int) virt_to_phys((void*)memaddr));
+        printk(KERN_NOTICE "%s: Arlan found at %llx, \n ", dev->name, 
+               (u64) virt_to_phys((void*)memaddr));
 
         ap->card = (void *) memaddr;
         dev->mem_start = memaddr;