lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse Source
This commit is contained in:
Linus Torvalds
2005-07-06 22:15:13 -07:00
parent 359ea2f135 e3e01d6005
commit c101f3136c
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@@ -2161,7 +2161,7 @@ UltraSPARC (sparc64):
P: David S. Miller P: David S. Miller
M: davem@davemloft.net M: davem@davemloft.net
P: Eddie C. Dost P: Eddie C. Dost
M: ecd@skynet.be M: ecd@brainaid.de
P: Jakub Jelinek P: Jakub Jelinek
M: jj@sunsite.ms.mff.cuni.cz M: jj@sunsite.ms.mff.cuni.cz
P: Anton Blanchard P: Anton Blanchard

7
arch/sparc64/kernel/irq.c
View File

@@ -917,7 +917,8 @@ static int irq_affinity_read_proc (char *page, char **start, off_t off,
int count, int *eof, void *data) int count, int *eof, void *data)
{ {
struct ino_bucket *bp = ivector_table + (long)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; cpumask_t mask;
int len; 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) static inline void set_intr_affinity(int irq, cpumask_t hw_aff)
{ {
struct ino_bucket *bp = ivector_table + irq; 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. /* Users specify affinity in terms of hw cpu ids.
* As soon as we do this, handler_irq() might see and take action. * 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 /* Migration is simply done by the next cpu to service this
* interrupt. * interrupt.

1
drivers/media/dvb/frontends/tda80xx.c
View File

@@ -27,7 +27,6 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/threads.h> #include <linux/threads.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>

4
include/asm-sparc64/parport.h
View File

@@ -27,12 +27,12 @@ static struct sparc_ebus_info {
static __inline__ void enable_dma(unsigned int dmanr) 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, if (ebus_dma_request(&sparc_ebus_dmas[dmanr].info,
sparc_ebus_dmas[dmanr].addr, sparc_ebus_dmas[dmanr].addr,
sparc_ebus_dmas[dmanr].count)) sparc_ebus_dmas[dmanr].count))
BUG(); BUG();
ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
} }
static __inline__ void disable_dma(unsigned int dmanr) static __inline__ void disable_dma(unsigned int dmanr)