Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

9 files changed, 42 insertions, 56 deletions

diff --git a/arch/microblaze/kernel/cpu/pvr.c b/arch/microblaze/kernel/cpu/pvr.c
index 488c1ed24e38..3a749d5e71fd 100644
--- a/arch/microblaze/kernel/cpu/pvr.c
+++ b/arch/microblaze/kernel/cpu/pvr.c
@@ -12,7 +12,6 @@
 
 #include <linux/kernel.h>
 #include <linux/compiler.h>
-#include <asm/system.h>
 #include <asm/exceptions.h>
 #include <asm/pvr.h>
 
diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c
index 3003d2f9f551..6c54d4dcdec3 100644
--- a/arch/microblaze/kernel/intc.c
+++ b/arch/microblaze/kernel/intc.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/irqdomain.h>
 #include <linux/irq.h>
 #include <asm/page.h>
 #include <linux/io.h>
@@ -25,8 +26,6 @@ static unsigned int intc_baseaddr;
 #define INTC_BASE       intc_baseaddr
 #endif
 
-unsigned int nr_irq;
-
 /* No one else should require these constants, so define them locally here. */
 #define ISR 0x00                        /* Interrupt Status Register */
 #define IPR 0x04                        /* Interrupt Pending Register */
@@ -84,24 +83,45 @@ static struct irq_chip intc_dev = {
         .irq_mask_ack = intc_mask_ack,
 };
 
-unsigned int get_irq(struct pt_regs *regs)
+static struct irq_domain *root_domain;
+
+unsigned int get_irq(void)
 {
-        int irq;
+        unsigned int hwirq, irq = -1;
 
-        /*
-         * NOTE: This function is the one that needs to be improved in
-         * order to handle multiple interrupt controllers. It currently
-         * is hardcoded to check for interrupts only on the first INTC.
-         */
-        irq = in_be32(INTC_BASE + IVR) + NO_IRQ_OFFSET;
-        pr_debug("get_irq: %d\n", irq);
+        hwirq = in_be32(INTC_BASE + IVR);
+        if (hwirq != -1U)
+                irq = irq_find_mapping(root_domain, hwirq);
+
+        pr_debug("get_irq: hwirq=%d, irq=%d\n", hwirq, irq);
 
         return irq;
 }
 
+int xintc_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
+{
+        u32 intr_mask = (u32)d->host_data;
+
+        if (intr_mask & (1 << hw)) {
+                irq_set_chip_and_handler_name(irq, &intc_dev,
+                                                handle_edge_irq, "edge");
+                irq_clear_status_flags(irq, IRQ_LEVEL);
+        } else {
+                irq_set_chip_and_handler_name(irq, &intc_dev,
+                                                handle_level_irq, "level");
+                irq_set_status_flags(irq, IRQ_LEVEL);
+        }
+        return 0;
+}
+
+static const struct irq_domain_ops xintc_irq_domain_ops = {
+        .xlate = irq_domain_xlate_onetwocell,
+        .map = xintc_map,
+};
+
 void __init init_IRQ(void)
 {
-        u32 i, intr_mask;
+        u32 nr_irq, intr_mask;
         struct device_node *intc = NULL;
 #ifdef CONFIG_SELFMOD_INTC
         unsigned int intc_baseaddr = 0;
@@ -146,16 +166,9 @@ void __init init_IRQ(void)
         /* Turn on the Master Enable. */
         out_be32(intc_baseaddr + MER, MER_HIE | MER_ME);
 
-        for (i = IRQ_OFFSET; i < (nr_irq + IRQ_OFFSET); ++i) {
-                if (intr_mask & (0x00000001 << (i - IRQ_OFFSET))) {
-                        irq_set_chip_and_handler_name(i, &intc_dev,
-                                handle_edge_irq, "edge");
-                        irq_clear_status_flags(i, IRQ_LEVEL);
-                } else {
-                        irq_set_chip_and_handler_name(i, &intc_dev,
-                                handle_level_irq, "level");
-                        irq_set_status_flags(i, IRQ_LEVEL);
-                }
-                irq_get_irq_data(i)->hwirq = i - IRQ_OFFSET;
-        }
+        /* Yeah, okay, casting the intr_mask to a void* is butt-ugly, but I'm
+         * lazy and Michal can clean it up to something nicer when he tests
+         * and commits this patch.  ~~gcl */
+        root_domain = irq_domain_add_linear(intc, nr_irq, &xintc_irq_domain_ops,
+                                                        (void *)intr_mask);
 }
diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c
index bbebcae72c02..ace700afbfdf 100644
--- a/arch/microblaze/kernel/irq.c
+++ b/arch/microblaze/kernel/irq.c
@@ -31,14 +31,13 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
         trace_hardirqs_off();
 
         irq_enter();
-        irq = get_irq(regs);
+        irq = get_irq();
 next_irq:
         BUG_ON(!irq);
-        /* Substract 1 because of get_irq */
-        generic_handle_irq(irq + IRQ_OFFSET - NO_IRQ_OFFSET);
+        generic_handle_irq(irq);
 
-        irq = get_irq(regs);
-        if (irq) {
+        irq = get_irq();
+        if (irq != -1U) {
                 pr_debug("next irq: %d\n", irq);
                 ++concurrent_irq;
                 goto next_irq;
@@ -48,18 +47,3 @@ next_irq:
         set_irq_regs(old_regs);
         trace_hardirqs_on();
 }
-
-/* MS: There is no any advance mapping mechanism. We are using simple 32bit
-  intc without any cascades or any connection that's why mapping is 1:1 */
-unsigned int irq_create_mapping(struct irq_host *host, irq_hw_number_t hwirq)
-{
-        return hwirq + IRQ_OFFSET;
-}
-EXPORT_SYMBOL_GPL(irq_create_mapping);
-
-unsigned int irq_create_of_mapping(struct device_node *controller,
-                                   const u32 *intspec, unsigned int intsize)
-{
-        return intspec[0] + IRQ_OFFSET;
-}
-EXPORT_SYMBOL_GPL(irq_create_of_mapping);
diff --git a/arch/microblaze/kernel/microblaze_ksyms.c b/arch/microblaze/kernel/microblaze_ksyms.c
index 49faeb429599..bb4907c828dc 100644
--- a/arch/microblaze/kernel/microblaze_ksyms.c
+++ b/arch/microblaze/kernel/microblaze_ksyms.c
@@ -18,7 +18,6 @@
 #include <asm/cacheflush.h>
 #include <linux/io.h>
 #include <asm/page.h>
-#include <asm/system.h>
 #include <linux/ftrace.h>
 #include <linux/uaccess.h>
 
diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c
index 7dcb5bfffb75..883b92789cdf 100644
--- a/arch/microblaze/kernel/process.c
+++ b/arch/microblaze/kernel/process.c
@@ -13,7 +13,6 @@
 #include <linux/pm.h>
 #include <linux/tick.h>
 #include <linux/bitops.h>
-#include <asm/system.h>
 #include <asm/pgalloc.h>
 #include <asm/uaccess.h> /* for USER_DS macros */
 #include <asm/cacheflush.h>
@@ -110,9 +109,7 @@ void cpu_idle(void)
                 rcu_idle_exit();
                 tick_nohz_idle_exit();
 
-                preempt_enable_no_resched();
-                schedule();
-                preempt_disable();
+                schedule_preempt_disabled();
                 check_pgt_cache();
         }
 }
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index 80d314e81901..4a764ccb9f26 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -36,7 +36,6 @@
 #include <asm/processor.h>
 #include <asm/irq.h>
 #include <linux/io.h>
-#include <asm/system.h>
 #include <asm/mmu.h>
 #include <asm/pgtable.h>
 #include <asm/sections.h>
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index 61dc7390984e..16d8dfd9094b 100644
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -30,7 +30,6 @@
 #include <asm/entry.h>
 #include <asm/cpuinfo.h>
 
-#include <asm/system.h>
 #include <asm/prom.h>
 #include <asm/pgtable.h>
 
@@ -51,8 +50,6 @@ void __init setup_arch(char **cmdline_p)
 
         unflatten_device_tree();
 
-        /* NOTE I think that this function is not necessary to call */
-        /* irq_early_init(); */
         setup_cpuinfo();
 
         microblaze_cache_init();
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index cadfd5608afb..522defa7d41f 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -27,7 +27,6 @@
 #include <asm/setup.h>
 #include <asm/prom.h>
 #include <asm/irq.h>
-#include <asm/system.h>
 #include <linux/cnt32_to_63.h>
 
 #ifdef CONFIG_SELFMOD_TIMER
diff --git a/arch/microblaze/kernel/traps.c b/arch/microblaze/kernel/traps.c
index ba034d421ec2..5541ac559593 100644
--- a/arch/microblaze/kernel/traps.c
+++ b/arch/microblaze/kernel/traps.c
@@ -15,7 +15,6 @@
 #include <linux/debug_locks.h>
 
 #include <asm/exceptions.h>
-#include <asm/system.h>
 #include <asm/unwind.h>
 
 void trap_init(void)