lkml.org 
[lkml]   [2007]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: 2.6.23-rc6-mm1
    From
    On Thu, Sep 20, 2007 at 09:42:44PM +0530, Kamalesh Babulal wrote:
    > On 9/20/07, Kamalesh Babulal <kamalesh.babulal@gmail.com> wrote:
    > > On 9/20/07, Andrew Morton <akpm@linux-foundation.org> wrote:
    > > >
    > > > On Wed, 19 Sep 2007 19:58:28 -0400
    > > > jfannin@gmail.com (Joseph Fannin) wrote:
    > > >
    > > > > On Tue, Sep 18, 2007 at 01:18:41AM -0700, Andrew Morton wrote:
    > > >
    > > > ---
    > > > a/include/asm-powerpc/smp.h~convert-cpu_sibling_map-to-a-per_cpu-data-array-ppc64-fix-2
    > > >
    > > > +++ a/include/asm-powerpc/smp.h
    > > > @@ -25,8 +25,8 @@
    > > >
    > > > #ifdef CONFIG_PPC64
    > > > #include <asm/paca.h>
    > > > -#include <asm/percpu.h>
    > > > #endif
    > > > +#include <asm/percpu.h>
    > > >
    > > > extern int boot_cpuid;


    > > Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
    > > ---
    > > --- linux-2.6.23-rc6 /drivers/net/mace.c 2007-09-20 17:16:50.000000000+0530
    > > +++ linux-2.6.23-rc6/drivers/net/~mace.c 2007-09-20 17:12:
    > > 47.000000000 +0530
    > > @@ -633,7 +633,7 @@ static void mace_set_multicast(struct ne
    > > spin_unlock_irqrestore(&mp->lock, flags);
    > > }
    > >
    > > -static void mace_handle_misc_intrs(struct mace_data *mp, int intr)
    > > +static void mace_handle_misc_intrs(struct mace_data *mp, int intr, struct
    > > net_device *dev)
    > > {
    > > volatile struct mace __iomem *mb = mp->mace;
    > > static int mace_babbles, mace_jabbers;
    > > @@ -669,7 +669,7 @@ static irqreturn_t mace_interrupt(int ir
    > > spin_lock_irqsave(&mp->lock, flags);
    > > intr = in_8(&mb->ir); /* read interrupt register */
    > > in_8(&mb->xmtrc); /* get retries */
    > > - mace_handle_misc_intrs(mp, intr);
    > > + mace_handle_misc_intrs(mp, intr, dev);
    > >
    > > i = mp->tx_empty;
    > > while (in_8(&mb->pr) & XMTSV) {
    > > @@ -682,7 +682,7 @@ static irqreturn_t mace_interrupt(int ir
    > > */
    > > intr = in_8(&mb->ir);
    > > if (intr != 0)
    > > - mace_handle_misc_intrs(mp, intr);
    > > + mace_handle_misc_intrs(mp, intr, dev);
    > > if (mp->tx_bad_runt) {
    > > fs = in_8(&mb->xmtfs);
    > > mp->tx_bad_runt = 0;
    > > @@ -817,7 +817,7 @@ static void mace_tx_timeout(unsigned lon
    > > goto out;
    > >
    > > /* update various counters */
    > > - mace_handle_misc_intrs(mp, in_8(&mb->ir));
    > > + mace_handle_misc_intrs(mp, in_8(&mb->ir), dev);
    > >
    > > cp = mp->tx_cmds + NCMDS_TX * mp->tx_empty;

    Both these patches have built and booted for me.

    I will send a patch for the following error separately, in what
    will hopefully be canonical patch submission format, in case that's of
    any use.

    Thanks.

    > drivers/net/mv643xx_eth.c: In function 'mv643xx_eth_int_handler':
    > drivers/net/mv643xx_eth.c:564: error: 'bp' undeclared (first use in this
    > function)
    > drivers/net/mv643xx_eth.c:564: error: (Each undeclared identifier is
    > reported only once
    > drivers/net/mv643xx_eth.c:564: error: for each function it appears in.)
    > drivers/net/mv643xx_eth.c: At top level:
    > drivers/net/mv643xx_eth.c:1010: error: conflicting types for 'mv643xx_poll'
    > drivers/net/mv643xx_eth.c:68: error: previous declaration of 'mv643xx_poll'
    > was here
    > make[2]: *** [drivers/net/mv643xx_eth.o] Error 1
    > make[1]: *** [drivers/net] Error 2
    > make: *** [drivers] Error 2


    --
    Joseph Fannin
    jfannin@gmail.com

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-09-21 04:07    [W:2.673 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site