Merge tag 'v3.5-rc4' into drm-intel-next-queued

I want to merge the "no more fake agp on gen6+" patches into
drm-intel-next (well, the last pieces). But a patch in 3.5-rc4 also
adds a new use of dev->agp. Hence the backmarge to sort this out, for
otherwise drm-intel-next merged into Linus' tree would conflict in the
relevant code, things would compile but nicely OOPS at driver load :(

Conflicts in this merge are just simple cases of "both branches
changed/added lines at the same place". The only tricky part is to
keep the order correct wrt the unwind code in case of errors in
intel_ringbuffer.c (and the MI_DISPLAY_FLIP #defines in i915_reg.h
together, obviously).

Conflicts:
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/i915/intel_ringbuffer.c

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 12 insertions, 10 deletions

diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c
index ae04914f7774..c145f6fd123b 100644
--- a/arch/sparc/kernel/irq_32.c
+++ b/arch/sparc/kernel/irq_32.c
@@ -241,9 +241,6 @@ int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler)
         unsigned int cpu_irq;
         int err;
 
-#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON
-        struct tt_entry *trap_table;
-#endif
 
         err = request_irq(irq, irq_handler, 0, "floppy", NULL);
         if (err)
@@ -264,13 +261,18 @@ int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler)
         table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP;
 
         INSTANTIATE(sparc_ttable)
-#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON
-        trap_table = &trapbase_cpu1;
-        INSTANTIATE(trap_table)
-        trap_table = &trapbase_cpu2;
-        INSTANTIATE(trap_table)
-        trap_table = &trapbase_cpu3;
-        INSTANTIATE(trap_table)
+
+#if defined CONFIG_SMP
+        if (sparc_cpu_model != sparc_leon) {
+                struct tt_entry *trap_table;
+
+                trap_table = &trapbase_cpu1;
+                INSTANTIATE(trap_table)
+                trap_table = &trapbase_cpu2;
+                INSTANTIATE(trap_table)
+                trap_table = &trapbase_cpu3;
+                INSTANTIATE(trap_table)
+        }
 #endif
 #undef INSTANTIATE
         /*