From 1ae52a25cfdbfc1cb238e3bdc6c44b41322787c5 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 31 Oct 2007 05:15:20 -0400 Subject: [PATCH] --- yaml --- r: 91635 b: refs/heads/master c: e8f39549580e04e0b8edd11bae834ae7f8322fc8 h: refs/heads/master i: 91633: 05dd3f6ad3453b21414769079804510ec84b071d 91631: 05735be307694bf55327e4f16057c72690f711af v: v3 --- [refs] | 2 +- trunk/arch/ppc/8xx_io/fec.c | 3 +-- trunk/arch/ppc/platforms/sbc82xx.c | 4 +++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 95935c67a158..b450ba714ea8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 349a2444cfcd6c078a8410c19cd7a950ff89bd96 +refs/heads/master: e8f39549580e04e0b8edd11bae834ae7f8322fc8 diff --git a/trunk/arch/ppc/8xx_io/fec.c b/trunk/arch/ppc/8xx_io/fec.c index 11b0aa6ca97e..d7b7ba93e1de 100644 --- a/trunk/arch/ppc/8xx_io/fec.c +++ b/trunk/arch/ppc/8xx_io/fec.c @@ -199,7 +199,6 @@ static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); #ifdef CONFIG_USE_MDIO static void fec_enet_mii(struct net_device *dev); #endif /* CONFIG_USE_MDIO */ -static irqreturn_t fec_enet_interrupt(int irq, void * dev_id); #ifdef CONFIG_FEC_PACKETHOOK static void fec_enet_tx(struct net_device *dev, __u32 regval); static void fec_enet_rx(struct net_device *dev, __u32 regval); @@ -472,7 +471,7 @@ fec_timeout(struct net_device *dev) * This is called from the MPC core interrupt. */ static irqreturn_t -fec_enet_interrupt(int irq, void * dev_id) +fec_enet_interrupt(int irq, void *dev_id) { struct net_device *dev = dev_id; volatile fec_t *fecp; diff --git a/trunk/arch/ppc/platforms/sbc82xx.c b/trunk/arch/ppc/platforms/sbc82xx.c index cc0935ccab7a..0df6aacb8237 100644 --- a/trunk/arch/ppc/platforms/sbc82xx.c +++ b/trunk/arch/ppc/platforms/sbc82xx.c @@ -121,8 +121,10 @@ struct hw_interrupt_type sbc82xx_i8259_ic = { .end = sbc82xx_i8259_end_irq, }; -static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id) +static irqreturn_t sbc82xx_i8259_demux(int dummy, void *dev_id) { + int irq; + spin_lock(&sbc82xx_i8259_lock); sbc82xx_i8259_map[0] = 0x0c; /* OCW3: Read IR register on RD# pulse */