linux-next: Tree for May 14 - Kernel

This is a discussion on linux-next: Tree for May 14 - Kernel ; Hi all, Changes since next-20080513: New trees: cifs, mmc and gfs2. There are a couple of conflicts between wireless-current and net (notified). ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git (tar balls and patches at http://www.kernel.org/pub/linux/kern...fr/linux-next/ ). If you ...

+ Reply to Thread
Results 1 to 10 of 10

Thread: linux-next: Tree for May 14

  1. linux-next: Tree for May 14

    Hi all,

    Changes since next-20080513:

    New trees: cifs, mmc and gfs2.

    There are a couple of conflicts between wireless-current and net (notified).

    ----------------------------------------------------------------------------

    I have created today's linux-next tree at
    git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
    (tar balls and patches at
    http://www.kernel.org/pub/linux/kern...fr/linux-next/). If you
    are tracking the linux-next tree using git, you should not use "git pull"
    to do so as that will try to merge the new linux-next release with the
    old one. You should use "git fetch" as mentioned in the FAQ on the wiki
    (see below).

    You can see which trees have been included by looking in the Next/Trees
    file in the source. There are also quilt-import.log and merge.log files
    in the Next directory. Between each merge, the tree was built with
    a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
    final fixups, it is also built with powerpc allnoconfig,
    44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.

    Below is a summary of the state of the merge.

    We are up to 71 trees (counting Linus' and 13 trees of patches pending for
    Linus' tree), more are welcome (even if they are currently empty).
    Thanks to those who have contributed, and to those who haven't, please do.

    Status of my local build tests will be at
    http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
    advice about cross compilers/configs that work, we are always open to add
    more builds.

    Thanks to Jan Dittmer for adding the linux-next tree to his build tests
    at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
    Dunlap for doing many randconfig builds.

    There is a wiki covering stuff to do with linux-next at
    http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.

    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    $ git reset --hard stable
    Merging origin/master
    Merging x86-fixes/for-linus
    Merging sched-fixes/for-linus
    Merging powerpc-merge/merge
    Merging scsi-rc-fixes/master
    Merging net-current/master
    Merging sparc-current/master
    Merging sound-current/for-linus
    Merging arm-current/master
    Merging pci-current/for-linus
    Merging wireless-current/master
    Merging kbuild-current/master
    Merging quilt/driver-core.current
    Merging quilt/usb.current
    Merging quilt/driver-core
    Merging quilt/usb
    Merging x86/for-akpm
    Merging sched/for-akpm
    Merging pci/linux-next
    Merging quilt/device-mapper
    Merging hid/mm
    Merging quilt/i2c
    Merging quilt/kernel-doc
    Merging avr32/avr32-arch
    Merging v4l-dvb/stable
    Merging s390/features
    Merging sh/master
    Merging jfs/next
    Merging kbuild/master
    Merging quilt/ide
    Merging libata/NEXT
    Merging nfs/linux-next
    Merging xfs/master
    Merging infiniband/for-next
    Merging acpi/test
    Merging blackfin/for-linus
    Merging nfsd/nfsd-next
    Merging ieee1394/for-next
    Merging hwmon/testing
    Merging ubi/master
    Merging kvm/master
    Merging dlm/next
    Merging scsi/master
    Merging ia64/test
    Merging tests/master
    CONFLICT (content): Merge conflict in lib/Kconfig.debug
    Merging ocfs2/linux-next
    Merging selinux/for-akpm
    Merging quilt/m68k
    Merging powerpc/powerpc-next
    Merging hrt/mm
    Merging lblnet/master
    Merging ext4/next
    Merging 4xx/next
    Merging async_tx/next
    Merging udf/for_next
    Merging security-testing/next
    Merging net/master
    CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-4965-rs.c
    CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt61pci.c
    Merging sparc/master
    Merging galak/powerpc-next
    Merging mtd/master
    Merging wireless/master
    Merging crypto/master
    Merging vfs/vfs-2.6.25
    Merging sound/master
    Merging arm/devel
    Merging cpufreq/master
    Merging v9fs/for-next
    Merging quilt/rr
    CONFLICT (content): Merge conflict in kernel/sysctl.c
    Merging cifs/master
    Merging mmc/next
    Merging gfs2/master
    Merging semaphore/semaphore
    Merging semaphore-removal/semaphore-removal
    CONFLICT (content): Merge conflict in drivers/atm/ambassador.c
    CONFLICT (content): Merge conflict in drivers/net/bonding/bond_main.c
    CONFLICT (content): Merge conflict in drivers/net/bonding/bond_sysfs.c
    Applying idr.h needs spinlock.h
    Merging quilt/ldp.next

    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.4.6 (GNU/Linux)

    iD8DBQFIKo46TgG2atn1QN8RAlqMAJ9UbJkiH8xIBRT6KXRDl0 X93lrFxwCbBale
    oAsOqtDxBC8AqeMMJk2JezE=
    =f/zY
    -----END PGP SIGNATURE-----


  2. Re: linux-next: Tree for May 14

    On Wed, 14 May 2008, Stephen Rothwell wrote:
    > Status of my local build tests will be at
    > http://kisskb.ellerman.id.au/linux-next . If maintainers want to give


    Do you have any idea why there's no real error message for the failure
    of m68k defconfig?

    http://kisskb.ellerman.id.au/kisskb/buildresult/27635/

    Gr{oetje,eeting}s,

    Geert

    --
    Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

    In personal conversations with technical people, I call myself a hacker. But
    when I'm talking to journalists I just say "programmer" or something like that.
    -- Linus Torvalds
    --
    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/

  3. Re: linux-next: Tree for May 14

    On Wed, 14 May 2008 22:38:15 +0200 (CEST) Geert Uytterhoeven wrote:

    > On Wed, 14 May 2008, Stephen Rothwell wrote:
    > > Status of my local build tests will be at
    > > http://kisskb.ellerman.id.au/linux-next . If maintainers want to give

    >
    > Do you have any idea why there's no real error message for the failure
    > of m68k defconfig?
    >
    > http://kisskb.ellerman.id.au/kisskb/buildresult/27635/


    Ugh. Can you please make the log file more readable?

    Or is a problem with my browser (firefox)?

    ---
    ~Randy
    --
    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/

  4. Re: linux-next: Tree for May 14

    On Wed, May 14, 2008 at 01:50:08PM -0700, Randy Dunlap wrote:

    > Ugh. Can you please make the log file more readable?
    >
    > Or is a problem with my browser (firefox)?


    It's a raw download, save it as a file and then view it (or look at the
    source).

    Yours Tony

    linux.conf.au http://www.marchsouth.org/
    Jan 19 - 24 2009 The Australian Linux Technical Conference!

    --
    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/

  5. Re: linux-next: Tree for May 14

    On Thu, May 15, 2008 at 07:04:47AM +1000, Tony Breeds wrote:
    > On Wed, May 14, 2008 at 01:50:08PM -0700, Randy Dunlap wrote:
    >
    > > Ugh. Can you please make the log file more readable?
    > >
    > > Or is a problem with my browser (firefox)?

    >
    > It's a raw download, save it as a file and then view it (or look at the
    > source).


    FWIW the error in question is:
    Using /scratch1/tony/next as source for kernel
    GEN /scratch1/tony/next_out/Makefile
    CHK include/linux/version.h
    CHK include/linux/utsrelease.h
    CALL /scratch1/tony/next/scripts/checksyscalls.sh
    CHK include/linux/compile.h
    CC [M] drivers/net/zorro8390.o
    In file included from /scratch1/tony/next/drivers/net/zorro8390.c:47:
    /scratch1/tony/next/drivers/net/lib8390.c: In function 'ei_tx_err':
    /scratch1/tony/next/drivers/net/lib8390.c:556: error: 'ei_local' undeclared (first use in this function)
    /scratch1/tony/next/drivers/net/lib8390.c:556: error: (Each undeclared identifier is reported only once
    /scratch1/tony/next/drivers/net/lib8390.c:556: error: for each function it appears in.)
    /scratch1/tony/next/drivers/net/lib8390.c: In function 'ei_rx_overrun':
    /scratch1/tony/next/drivers/net/lib8390.c:823: error: 'ei_local' undeclared (first use in this function)
    make[3]: *** [drivers/net/zorro8390.o] Error 1
    make[2]: *** [drivers/net] Error 2
    make[1]: *** [drivers] Error 2
    make: *** [sub-make] Error 2

    It was introduced by 3f8cb098859bbea29d7b3765a3102e4a6bf81b85
    (drivers/net/lib8390: fix warning, trim trailing whitespace)

    The problem is that ei_inb_p() is using various #defines (from
    drivers/net/8390.h) that use EI_SHIFT, which in the zorro8390 case uses
    ei_local. Since zorro8390 is only build for m68k, guard the definition of
    ei_local with CONFIG_M68K

    The patch below fixes the zorro8390 build, and I think will keep the warnings
    that Jeff is trying to silence silenced.

    Signed-off-by: Tony Breeds

    ---

    drivers/net/lib8390.c | 6 ++++++
    1 files changed, 6 insertions(+), 0 deletions(-)

    diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
    index ed49527..a3d04a1 100644
    --- a/drivers/net/lib8390.c
    +++ b/drivers/net/lib8390.c
    @@ -553,6 +553,9 @@ static void __ei_poll(struct net_device *dev)
    static void ei_tx_err(struct net_device *dev)
    {
    unsigned long e8390_base = dev->base_addr;
    +#ifdef CONFIG_M68K
    + struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
    +#endif
    unsigned char txsr = ei_inb_p(e8390_base+EN0_TSR);
    unsigned char tx_was_aborted = txsr & (ENTSR_ABT+ENTSR_FU);

    @@ -815,6 +818,9 @@ static void ei_rx_overrun(struct net_device *dev)
    {
    unsigned long e8390_base = dev->base_addr;
    unsigned char was_txing, must_resend = 0;
    +#ifdef CONFIG_M68K
    + struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
    +#endif

    /*
    * Record whether a Tx was in progress and then issue the

    Yours Tony

    linux.conf.au http://www.marchsouth.org/
    Jan 19 - 24 2009 The Australian Linux Technical Conference!

    --
    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/

  6. Re: linux-next: Tree for May 14

    On Thu, 15 May 2008, Tony Breeds wrote:
    > On Thu, May 15, 2008 at 07:04:47AM +1000, Tony Breeds wrote:
    > > On Wed, May 14, 2008 at 01:50:08PM -0700, Randy Dunlap wrote:
    > >
    > > > Ugh. Can you please make the log file more readable?
    > > >
    > > > Or is a problem with my browser (firefox)?

    > >
    > > It's a raw download, save it as a file and then view it (or look at the
    > > source).


    That's what I did....

    > FWIW the error in question is:
    > Using /scratch1/tony/next as source for kernel
    > GEN /scratch1/tony/next_out/Makefile
    > CHK include/linux/version.h
    > CHK include/linux/utsrelease.h
    > CALL /scratch1/tony/next/scripts/checksyscalls.sh
    > CHK include/linux/compile.h
    > CC [M] drivers/net/zorro8390.o
    > In file included from /scratch1/tony/next/drivers/net/zorro8390.c:47:
    > /scratch1/tony/next/drivers/net/lib8390.c: In function 'ei_tx_err':
    > /scratch1/tony/next/drivers/net/lib8390.c:556: error: 'ei_local' undeclared (first use in this function)
    > /scratch1/tony/next/drivers/net/lib8390.c:556: error: (Each undeclared identifier is reported only once
    > /scratch1/tony/next/drivers/net/lib8390.c:556: error: for each function it appears in.)
    > /scratch1/tony/next/drivers/net/lib8390.c: In function 'ei_rx_overrun':
    > /scratch1/tony/next/drivers/net/lib8390.c:823: error: 'ei_local' undeclared (first use in this function)
    > make[3]: *** [drivers/net/zorro8390.o] Error 1
    > make[2]: *** [drivers/net] Error 2
    > make[1]: *** [drivers] Error 2
    > make: *** [sub-make] Error 2


    Wow, did you really get all of this from that webpage??

    > It was introduced by 3f8cb098859bbea29d7b3765a3102e4a6bf81b85
    > (drivers/net/lib8390: fix warning, trim trailing whitespace)
    >
    > The problem is that ei_inb_p() is using various #defines (from
    > drivers/net/8390.h) that use EI_SHIFT, which in the zorro8390 case uses
    > ei_local. Since zorro8390 is only build for m68k, guard the definition of


    Thanks for chasing this down!

    > ei_local with CONFIG_M68K


    Technically, it could also happen on PPC (APUS), but all APUS support got
    removed a few months ago.
    So maybe CONFIG_ZORRO is more appropriate?

    (CONFIG_ZORRO8390 || CONFIG_ZORRO8390_MODULE is probably frowned upon?)

    > The patch below fixes the zorro8390 build, and I think will keep the warnings
    > that Jeff is trying to silence silenced.
    >
    > Signed-off-by: Tony Breeds
    >
    > ---
    >
    > drivers/net/lib8390.c | 6 ++++++
    > 1 files changed, 6 insertions(+), 0 deletions(-)
    >
    > diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
    > index ed49527..a3d04a1 100644
    > --- a/drivers/net/lib8390.c
    > +++ b/drivers/net/lib8390.c
    > @@ -553,6 +553,9 @@ static void __ei_poll(struct net_device *dev)
    > static void ei_tx_err(struct net_device *dev)
    > {
    > unsigned long e8390_base = dev->base_addr;
    > +#ifdef CONFIG_M68K
    > + struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
    > +#endif
    > unsigned char txsr = ei_inb_p(e8390_base+EN0_TSR);
    > unsigned char tx_was_aborted = txsr & (ENTSR_ABT+ENTSR_FU);
    >
    > @@ -815,6 +818,9 @@ static void ei_rx_overrun(struct net_device *dev)
    > {
    > unsigned long e8390_base = dev->base_addr;
    > unsigned char was_txing, must_resend = 0;
    > +#ifdef CONFIG_M68K
    > + struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
    > +#endif
    >
    > /*
    > * Record whether a Tx was in progress and then issue the


    Gr{oetje,eeting}s,

    Geert

    --
    Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

    In personal conversations with technical people, I call myself a hacker. But
    when I'm talking to journalists I just say "programmer" or something like that.
    -- Linus Torvalds
    --
    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/

  7. Re: linux-next: Tree for May 14

    Hi Geert,

    On Thu, 15 May 2008 09:17:15 +0200 (CEST) Geert Uytterhoeven wrote:
    >
    > Wow, did you really get all of this from that webpage??


    No, he didn't. He reran the build by hand. Sorry, but there appears to
    a bug somewhere in our build system (or one of the tools it is using)
    that very occasionally loses a line of the log. We are trying to track
    it down.

    > > The patch below fixes the zorro8390 build, and I think will keep the warnings
    > > that Jeff is trying to silence silenced.


    I have applied this patch to today's linux-next, so that this particular
    bug will not prevent the m68k builds. I am hoping someone will pick it
    up (or an equivalent patch) so I can drop it again.

    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/

    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.4.6 (GNU/Linux)

    iD8DBQFIK+TmTgG2atn1QN8RAgCpAJsGoCnHoEreHK3VwUDqPf r/0GPN0wCfbPqO
    bAISpwUqIcYB6hBlPoKXg+0=
    =kt78
    -----END PGP SIGNATURE-----


  8. Re: linux-next: Tree for May 14

    On Thu, May 15, 2008 at 09:17:15AM +0200, Geert Uytterhoeven wrote:

    > Wow, did you really get all of this from that webpage??


    Sorry no. I ran the build again ... mmm cross compilers

    > Thanks for chasing this down!


    np.

    > Technically, it could also happen on PPC (APUS), but all APUS support got
    > removed a few months ago.
    > So maybe CONFIG_ZORRO is more appropriate?


    Well as it turns out it can happen in a few other plcaes (the same error
    is visible on sh aswell:
    http://kisskb.ellerman.id.au/kisskb/buildresult/27769/ )

    Below is a new fix. Thoughts?.

    From: Tony Breeds
    Subject: [PATCH] Fix various 8390 builds

    The commit 3f8cb098859bbea29d7b3765a3102e4a6bf81b85
    (drivers/net/lib8390: fix warning, trim trailing whitespace) removed
    ei_local from ei_tx_err() and ei_rx_overrun() resulting in the following
    build errors on m68k and sh:

    Using /scratch1/tony/next as source for kernel
    GEN /scratch1/tony/next_out/Makefile
    CHK include/linux/version.h
    CHK include/linux/utsrelease.h
    CALL /scratch1/tony/next/scripts/checksyscalls.sh
    CHK include/linux/compile.h
    CC [M] drivers/net/zorro8390.o
    In file included from /scratch1/tony/next/drivers/net/zorro8390.c:47:
    drivers/net/lib8390.c: In function 'ei_tx_err':
    drivers/net/lib8390.c:556: error: 'ei_local' undeclared (first use in this function)
    drivers/net/lib8390.c:556: error: (Each undeclared identifier is reported only once
    drivers/net/lib8390.c:556: error: for each function it appears in.)
    drivers/net/lib8390.c: In function 'ei_rx_overrun':
    drivers/net/lib8390.c:823: error: 'ei_local' undeclared (first use in this function)
    make[3]: *** [drivers/net/zorro8390.o] Error 1
    make[2]: *** [drivers/net] Error 2
    make[1]: *** [drivers] Error 2
    make: *** [sub-make] Error 2

    The problem is that ei_inb_p() is using various #defines (from
    drivers/net/8390.h) that use EI_SHIFT, which in some drivers on some
    architectures use ei_local. Tag ei_local as "__maybe_unused" to keep it
    around and keep the warnings the original commit is trying to silence
    .... silenced.

    Signed-off-by: Tony Breeds
    ---
    drivers/net/lib8390.c | 6 ++++++
    1 files changed, 6 insertions(+), 0 deletions(-)

    diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
    index ed49527..fb00268 100644
    --- a/drivers/net/lib8390.c
    +++ b/drivers/net/lib8390.c
    @@ -553,6 +553,9 @@ static void __ei_poll(struct net_device *dev)
    static void ei_tx_err(struct net_device *dev)
    {
    unsigned long e8390_base = dev->base_addr;
    + /* ei_local is used on some platforms via the EI_SHIFT macro */
    + struct ei_device *ei_local __maybe_unused =
    + (struct ei_device *) netdev_priv(dev);
    unsigned char txsr = ei_inb_p(e8390_base+EN0_TSR);
    unsigned char tx_was_aborted = txsr & (ENTSR_ABT+ENTSR_FU);

    @@ -815,6 +818,9 @@ static void ei_rx_overrun(struct net_device *dev)
    {
    unsigned long e8390_base = dev->base_addr;
    unsigned char was_txing, must_resend = 0;
    + /* ei_local is used on some platforms via the EI_SHIFT macro */
    + struct ei_device *ei_local __maybe_unused =
    + (struct ei_device *) netdev_priv(dev);

    /*
    * Record whether a Tx was in progress and then issue the
    --
    1.5.5.1

    --
    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/

  9. Re: linux-next: Tree for May 14

    On Fri, 16 May 2008, Tony Breeds wrote:
    > On Thu, May 15, 2008 at 09:17:15AM +0200, Geert Uytterhoeven wrote:
    > > Technically, it could also happen on PPC (APUS), but all APUS support got
    > > removed a few months ago.
    > > So maybe CONFIG_ZORRO is more appropriate?

    >
    > Well as it turns out it can happen in a few other plcaes (the same error
    > is visible on sh aswell:
    > http://kisskb.ellerman.id.au/kisskb/buildresult/27769/ )
    >
    > Below is a new fix. Thoughts?.


    Looks OK to me!

    > --- a/drivers/net/lib8390.c
    > +++ b/drivers/net/lib8390.c
    > @@ -553,6 +553,9 @@ static void __ei_poll(struct net_device *dev)
    > static void ei_tx_err(struct net_device *dev)
    > {
    > unsigned long e8390_base = dev->base_addr;
    > + /* ei_local is used on some platforms via the EI_SHIFT macro */
    > + struct ei_device *ei_local __maybe_unused =
    > + (struct ei_device *) netdev_priv(dev);

    ^^^^^^^^^^^^^^^^^^^^
    But please don't reintroduce the casts. netdev_priv() returns a void *.

    > unsigned char txsr = ei_inb_p(e8390_base+EN0_TSR);
    > unsigned char tx_was_aborted = txsr & (ENTSR_ABT+ENTSR_FU);
    >
    > @@ -815,6 +818,9 @@ static void ei_rx_overrun(struct net_device *dev)
    > {
    > unsigned long e8390_base = dev->base_addr;
    > unsigned char was_txing, must_resend = 0;
    > + /* ei_local is used on some platforms via the EI_SHIFT macro */
    > + struct ei_device *ei_local __maybe_unused =
    > + (struct ei_device *) netdev_priv(dev);

    ^^^^^^^^^^^^^^^^^^^^
    Gr{oetje,eeting}s,

    Geert

    --
    Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

    In personal conversations with technical people, I call myself a hacker. But
    when I'm talking to journalists I just say "programmer" or something like that.
    -- Linus Torvalds
    --
    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/

  10. [PATCH v3] Fix various 8390 builds

    The commit 3f8cb098859bbea29d7b3765a3102e4a6bf81b85
    (drivers/net/lib8390: fix warning, trim trailing whitespace) removed
    ei_local from ei_tx_err() and ei_rx_overrun() resulting in the following
    build errors on m68k and sh:

    Using /scratch1/tony/next as source for kernel
    GEN /scratch1/tony/next_out/Makefile
    CHK include/linux/version.h
    CHK include/linux/utsrelease.h
    CALL /scratch1/tony/next/scripts/checksyscalls.sh
    CHK include/linux/compile.h
    CC [M] drivers/net/zorro8390.o
    In file included from /scratch1/tony/next/drivers/net/zorro8390.c:47:
    drivers/net/lib8390.c: In function 'ei_tx_err':
    drivers/net/lib8390.c:556: error: 'ei_local' undeclared (first use in this function)
    drivers/net/lib8390.c:556: error: (Each undeclared identifier is reported only once
    drivers/net/lib8390.c:556: error: for each function it appears in.)
    drivers/net/lib8390.c: In function 'ei_rx_overrun':
    drivers/net/lib8390.c:823: error: 'ei_local' undeclared (first use in this function)
    make[3]: *** [drivers/net/zorro8390.o] Error 1
    make[2]: *** [drivers/net] Error 2
    make[1]: *** [drivers] Error 2
    make: *** [sub-make] Error 2

    The problem is that ei_inb_p() is using various #defines (from
    drivers/net/8390.h) that use EI_SHIFT, which in some drivers on some
    architectures use ei_local. Tag ei_local as "__maybe_unused" to keep it
    around and keep the warnings the original commit is trying to silence
    .... silenced.

    Signed-off-by: Tony Breeds
    ---
    Updated to remove pointless casts

    drivers/net/lib8390.c | 4 ++++
    1 file changed, 4 insertions(+)

    Dave, Jeff can one of you take this?


    diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
    index ed49527..00d59ab 100644
    --- a/drivers/net/lib8390.c
    +++ b/drivers/net/lib8390.c
    @@ -553,6 +553,8 @@ static void __ei_poll(struct net_device *dev)
    static void ei_tx_err(struct net_device *dev)
    {
    unsigned long e8390_base = dev->base_addr;
    + /* ei_local is used on some platforms via the EI_SHIFT macro */
    + struct ei_device *ei_local __maybe_unused = netdev_priv(dev);
    unsigned char txsr = ei_inb_p(e8390_base+EN0_TSR);
    unsigned char tx_was_aborted = txsr & (ENTSR_ABT+ENTSR_FU);

    @@ -815,6 +817,8 @@ static void ei_rx_overrun(struct net_device *dev)
    {
    unsigned long e8390_base = dev->base_addr;
    unsigned char was_txing, must_resend = 0;
    + /* ei_local is used on some platforms via the EI_SHIFT macro */
    + struct ei_device *ei_local __maybe_unused = netdev_priv(dev);

    /*
    * Record whether a Tx was in progress and then issue the
    Yours Tony

    linux.conf.au http://www.marchsouth.org/
    Jan 19 - 24 2009 The Australian Linux Technical Conference!

    --
    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/

+ Reply to Thread