Merge branch 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

This merges branches irq/genirq, irq/sparseirq-v4, timers/hpet-percpu
and x86/uv.

The sparseirq branch is just preliminary groundwork: no sparse IRQs are
actually implemented by this tree anymore - just the new APIs are added
while keeping the old way intact as well (the new APIs map 1:1 to
irq_desc[]).  The 'real' sparse IRQ support will then be a relatively
small patch ontop of this - with a v2.6.29 merge target.

* 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (178 commits)
  genirq: improve include files
  intr_remapping: fix typo
  io_apic: make irq_mis_count available on 64-bit too
  genirq: fix name space collisions of nr_irqs in arch/*
  genirq: fix name space collision of nr_irqs in autoprobe.c
  genirq: use iterators for irq_desc loops
  proc: fixup irq iterator
  genirq: add reverse iterator for irq_desc
  x86: move ack_bad_irq() to irq.c
  x86: unify show_interrupts() and proc helpers
  x86: cleanup show_interrupts
  genirq: cleanup the sparseirq modifications
  genirq: remove artifacts from sparseirq removal
  genirq: revert dynarray
  genirq: remove irq_to_desc_alloc
  genirq: remove sparse irq code
  genirq: use inline function for irq_to_desc
  genirq: consolidate nr_irqs and for_each_irq_desc()
  x86: remove sparse irq from Kconfig
  genirq: define nr_irqs for architectures with GENERIC_HARDIRQS=n
  ...

4 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 491ee16da5c1..9ba295d9dd97 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -90,7 +90,7 @@ static int vortex_debug = 1;
 #include <linux/eisa.h>
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
-#include <asm/irq.h>                    /* For NR_IRQS only. */
+#include <asm/irq.h>                    /* For nr_irqs only. */
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
@@ -1221,7 +1221,7 @@ static int __devinit vortex_probe1(struct device *gendev,
         if (print_info)
                 printk(", IRQ %d\n", dev->irq);
         /* Tell them about an invalid IRQ. */
-        if (dev->irq <= 0 || dev->irq >= NR_IRQS)
+        if (dev->irq <= 0 || dev->irq >= nr_irqs)
                 printk(KERN_WARNING " *** Warning: IRQ %d is unlikely to work! ***\n",
                            dev->irq);
 
diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c
index 17ac6975d70d..b6a816e60c0f 100644
--- a/drivers/net/hamradio/baycom_ser_fdx.c
+++ b/drivers/net/hamradio/baycom_ser_fdx.c
@@ -416,10 +416,10 @@ static int ser12_open(struct net_device *dev)
         if (!dev || !bc)
                 return -ENXIO;
         if (!dev->base_addr || dev->base_addr > 0xffff-SER12_EXTENT ||
-            dev->irq < 2 || dev->irq > NR_IRQS) {
+            dev->irq < 2 || dev->irq > nr_irqs) {
                 printk(KERN_INFO "baycom_ser_fdx: invalid portnumber (max %u) "
                                 "or irq (2 <= irq <= %d)\n",
-                                0xffff-SER12_EXTENT, NR_IRQS);
+                                0xffff-SER12_EXTENT, nr_irqs);
                 return -ENXIO;
         }
         if (bc->baud < 300 || bc->baud > 4800) {
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 45ae9d1191d7..c17e39bc5460 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -1465,7 +1465,7 @@ static void z8530_init(void)
         printk(KERN_INFO "Init Z8530 driver: %u channels, IRQ", Nchips*2);
         
         flag=" ";
-        for (k = 0; k < NR_IRQS; k++)
+        for (k = 0; k < nr_irqs; k++)
                 if (Ivec[k].used) 
                 {
                         printk("%s%d", flag, k);
@@ -1728,7 +1728,7 @@ static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
                         if (hwcfg.irq == 2) hwcfg.irq = 9;
 
-                        if (hwcfg.irq < 0 || hwcfg.irq >= NR_IRQS)
+                        if (hwcfg.irq < 0 || hwcfg.irq >= nr_irqs)
                                 return -EINVAL;
                                 
                         if (!Ivec[hwcfg.irq].used && hwcfg.irq)
@@ -2148,7 +2148,7 @@ static void __exit scc_cleanup_driver(void)
                 }
                 
         /* To unload the port must be closed so no real IRQ pending */
-        for (k=0; k < NR_IRQS ; k++)
+        for (k = 0; k < nr_irqs ; k++)
                 if (Ivec[k].used) free_irq(k, NULL);
                 
         local_irq_enable();
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index f972fef87c98..ee51b6a5e605 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -318,7 +318,7 @@ sbni_pci_probe( struct net_device  *dev )
                                 continue;
                 }
 
-                if( pci_irq_line <= 0  ||  pci_irq_line >= NR_IRQS )
+                if (pci_irq_line <= 0 || pci_irq_line >= nr_irqs)
                         printk( KERN_WARNING "  WARNING: The PCI BIOS assigned "
                                 "this PCI card to IRQ %d, which is unlikely "
                                 "to work!.\n"