Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 7 Jul 2005 05:15:13 +0000 (22:15 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 7 Jul 2005 05:15:13 +0000 (22:15 -0700)
MAINTAINERS
arch/sparc64/kernel/irq.c
drivers/media/dvb/frontends/tda80xx.c
include/asm-sparc64/parport.h

index 19a9a1c530371a9328af010d96d2544e88289378..302b319600085c61ef5ea756acb7c6c49f58cd63 100644 (file)
@@ -2161,7 +2161,7 @@ UltraSPARC (sparc64):
 P:     David S. Miller
 M:     davem@davemloft.net
 P:     Eddie C. Dost
-M:     ecd@skynet.be
+M:     ecd@brainaid.de
 P:     Jakub Jelinek
 M:     jj@sunsite.ms.mff.cuni.cz
 P:     Anton Blanchard
index 74a2e0808cbcda8939a2708c37aa5cec96f08816..daa2fb93052ca0b030051f84161be3f22242422e 100644 (file)
@@ -917,7 +917,8 @@ static int irq_affinity_read_proc (char *page, char **start, off_t off,
                        int count, int *eof, void *data)
 {
        struct ino_bucket *bp = ivector_table + (long)data;
-       struct irqaction *ap = bp->irq_info;
+       struct irq_desc *desc = bp->irq_info;
+       struct irqaction *ap = desc->action;
        cpumask_t mask;
        int len;
 
@@ -935,11 +936,13 @@ static int irq_affinity_read_proc (char *page, char **start, off_t off,
 static inline void set_intr_affinity(int irq, cpumask_t hw_aff)
 {
        struct ino_bucket *bp = ivector_table + irq;
+       struct irq_desc *desc = bp->irq_info;
+       struct irqaction *ap = desc->action;
 
        /* Users specify affinity in terms of hw cpu ids.
         * As soon as we do this, handler_irq() might see and take action.
         */
-       put_smpaff_in_irqaction((struct irqaction *)bp->irq_info, hw_aff);
+       put_smpaff_in_irqaction(ap, hw_aff);
 
        /* Migration is simply done by the next cpu to service this
         * interrupt.
index 032d348dafb749acfb9144453e8400d8666c42a8..88e125079ca15579acf8eea92cf06d480e79d003 100644 (file)
@@ -27,7 +27,6 @@
 #include <linux/spinlock.h>
 #include <linux/threads.h>
 #include <linux/interrupt.h>
-#include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
index b7e635544cecce868e1e5fdc7cf328528b934c3d..56b5197d789827e680d72027bb03c407daaefe0f 100644 (file)
@@ -27,12 +27,12 @@ static struct sparc_ebus_info {
 
 static __inline__ void enable_dma(unsigned int dmanr)
 {
+       ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
+
        if (ebus_dma_request(&sparc_ebus_dmas[dmanr].info,
                             sparc_ebus_dmas[dmanr].addr,
                             sparc_ebus_dmas[dmanr].count))
                BUG();
-
-       ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
 }
 
 static __inline__ void disable_dma(unsigned int dmanr)