23 Mar, 2006

37 commits

  • Update version to 1.4.39.

    Signed-off-by: Michael Chan
    Signed-off-by: David S. Miller

    Michael Chan
     
  • Put the tx producer and consumer fields in separate cache lines in
    the device structure, similar to the VJ net channel queue structure.

    Signed-off-by: Michael Chan
    Signed-off-by: David S. Miller

    Michael Chan
     
  • Move all #include <> from bnx2.h to bnx2.c.

    Signed-off-by: Michael Chan
    Signed-off-by: David S. Miller

    Michael Chan
     
  • Combine two small (56 byte and 320 byte) pci consistent memory
    allocations into one allocation. Jeff Garzik suggested to store
    the combined size in the bp structure for later use when freeing
    the memory.

    Use kzalloc() instead of kmalloc() + memset().

    Signed-off-by: Michael Chan
    Signed-off-by: David S. Miller

    Michael Chan
     
  • Fix some link-related problems by doing a coalesce_now after link
    change interrupt to flush out the transient link status.

    To facilitate this, the host coalesce cmd register value is cached in
    the device structure.

    Signed-off-by: Michael Chan
    Signed-off-by: David S. Miller

    Michael Chan
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (78 commits)
    [PATCH] powerpc: Add FSL SEC node to documentation
    [PATCH] macintosh: tidy-up driver_register() return values
    [PATCH] powerpc: tidy-up of_register_driver()/driver_register() return values
    [PATCH] powerpc: via-pmu warning fix
    [PATCH] macintosh: cleanup the use of i2c headers
    [PATCH] powerpc: dont allow old RTC to be selected
    [PATCH] powerpc: make powerbook_sleep_grackle static
    [PATCH] powerpc: Fix warning in add_memory
    [PATCH] powerpc: update mailing list addresses
    [PATCH] powerpc: Remove calculation of io hole
    [PATCH] powerpc: iseries: Add bootargs to /chosen
    [PATCH] powerpc: iseries: Add /system-id, /model and /compatible
    [PATCH] powerpc: Add strne2a() to convert a string from EBCDIC to ASCII
    [PATCH] powerpc: iseries: Make more stuff static in platforms/iseries/mf.c
    [PATCH] powerpc: iseries: Remove pointless iSeries_(restart|power_off|halt)
    [PATCH] powerpc: iseries: mf related cleanups
    [PATCH] powerpc: Replace platform_is_lpar() with a firmware feature
    [PATCH] powerpc: trivial: Cleanup whitespace in cputable.h
    [PATCH] powerpc: Remove unused iommu_off logic from pSeries_init_early()
    [PATCH] powerpc: Unconfuse htab_bolt_mapping() callers
    ...

    Linus Torvalds
     
  • Remove the assumption that driver_register() returns the number of devices
    bound to the driver. In fact, it returns zero for success or a negative
    error value.

    All callers of macio_register_driver() either ignore the return value or
    return it as the return value of a module_init() function.

    Signed-off-by: Bjorn Helgaas
    Cc: Benjamin Herrenschmidt
    Signed-off-by: Andrew Morton
    Signed-off-by: Paul Mackerras

    Bjorn Helgaas
     
  • Remove the assumption that driver_register() returns the number of devices
    bound to the driver. In fact, it returns zero for success or a negative
    error value.

    Nobody uses the return value of of_register_driver() anyway.

    Signed-off-by: Bjorn Helgaas
    Acked-by: Benjamin Herrenschmidt
    Signed-off-by: Andrew Morton
    Signed-off-by: Paul Mackerras

    Bjorn Helgaas
     
  • drivers/macintosh/via-pmu.c:164: warning: `sleep_in_progress' defined but not used

    Cc: Benjamin Herrenschmidt
    Signed-off-by: Andrew Morton
    Signed-off-by: Paul Mackerras

    Andrew Morton
     
  • Cleanup the use of i2c headers in macintosh drivers.

    Signed-off-by: Jean Delvare
    Signed-off-by: Benjamin Herrenschmidt
    Signed-off-by: Andrew Morton
    Signed-off-by: Paul Mackerras

    Jean Delvare
     
  • Now powerpc uses the generic RTC stuff we should not enable the old RTC.
    Doing so will result in hangs at boot.

    Signed-off-by: Anton Blanchard
    Signed-off-by: Andrew Morton
    Signed-off-by: Paul Mackerras

    Anton Blanchard
     
  • powerbook_sleep_grackle is only called inside via-pmu, from pmu_ioctl()

    Signed-off-by: Olaf Hering
    Signed-off-by: Andrew Morton
    Signed-off-by: Paul Mackerras

    Olaf Hering
     
  • * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
    [PATCH] Use of uninitialized variable in drivers/net/depca.c
    [PATCH] Use after free in net/tulip/de2104x.c
    [PATCH] sis900 adm7001 PHY support
    [PATCH] sky2: more ethtool stats
    [PATCH] s390: qeth :allow setting of attribute "route6" to "no_router".
    [PATCH] s390: qeth driver cleanups
    [PATCH] s390: qeth driver statistics fixes
    [PATCH] AMD Au1xx0: fix Ethernet TX stats
    [PATCH] fix spidernet build issue

    Linus Torvalds
     
  • If the debug driver is built-in, link it in last, so that any real
    drivers will probe first, rather than having the debug driver pick the
    first scsi slots..

    Signed-off-by: Douglas Gilbert
    Signed-off-by: Randy Dunlap
    Acked-by: James Bottomley
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • * master.kernel.org:/home/rmk/linux-2.6-serial:
    [SERIAL] Merge avlab serial board entries in parport_serial
    [SERIAL] kernel console should send CRLF not LFCR

    Linus Torvalds
     
  • * master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)
    [ARM] 3389/1: typo and grammar fix
    [ARM] 3386/1: AT91RM9200 Clock update
    [ARM] 3384/1: AT91RM9200: Timer
    [ARM] 3382/1: ixp2000: unify defconfigs
    [ARM] 3381/1: ixp2000: fix slowport write timing control register fields
    [ARM] 3380/1: ixp2000: simplify ixdp2x00_master_npu() check
    [ARM] 3379/1: ixp2000: use generic 8250 debug macros
    [ARM] 3378/1: ixp2000: fix gpio interrupt handling
    [ARM] Quieten spurious IRQ detection
    [ARM] Use kcalloc to allocate counter_config array rather than kmalloc
    [ARM] Oprofile: dynamically allocate counter_config
    [ARM] Oprofile: Convert semaphore to mutex
    [ARM] 3376/2: S3C2410 - update defconfig
    [ARM] 3375/1: S3C2440 - fix osiris machine build
    [ARM] 3374/1: ep93xx: gpio interrupt support
    [ARM] 3361/1: S3C24XX - add USB bus clock source
    [ARM] 3360/1: S3C2440 - add set rate methods and camera clock
    [ARM] 3359/1: S3C24XX - add support for clk_set_rate
    [ARM] Convert kmalloc+memset to kzalloc
    [ARM] 3373/1: move uengine loader to arch/arm/common
    ...

    Linus Torvalds
     
  • hi,

    this fixes coverity bug #888, where the variable
    dev is used uninitialized. I assume the programmer
    meant to use mdev, which is initialized.
    Compile tested only.

    Signed-off-by: Eric Sesterhenn
    Signed-off-by: Jeff Garzik

    Eric Sesterhenn
     
  • hi,

    this fixes coverity bug #912, where skb is freed first,
    and dereferenced a few lines later with skb->len.

    Signed-off-by: Eric Sesterhenn
    Signed-off-by: Jeff Garzik

    Eric Sesterhenn
     
  • this patch is required to get a SIS964 based motherboard ethernet working (FSC D1875)
    (picking the #1 transceiver, instead of the last one, in case no known ones were found
    might be a better default, and would have worked in this case too)

    Signed-off-by: Artur Skawina
    Signed-off-by: Jeff Garzik

    Artur Skawina
     
  • Expose all the available hardware statistics via ethtool.
    And cleanup some of the statistics definitions.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • [patch 4/6] s390: qeth :allow setting of attribute "route6" to "no_router".

    From: Ursula Braun
    when setting route6 attribute back to no_router qeth does not
    issue an IP ASSIST command to reset router value to no_router.
    Once primary_router is set device stays in this mode.
    Issue an IP ASSIST command when no_router is set in route6.
    Device will be reset and thus will not longer run as a primary
    router.

    Signed-off-by: Frank Pavlic

    diffstat:
    qeth_main.c | 5 -----
    1 files changed, 5 deletions(-)
    Signed-off-by: Jeff Garzik

    Frank Pavlic
     
  • [patch 3/6] s390: qeth driver cleanups

    From: Ursula Braun
    - code analyzing tool BEAM has found some unreachable
    and unnecessary statements and also conditions
    which are always true.
    - removed some useless MII code since OSA card will never
    allow to set such values.

    Signed-off-by: Frank Pavlic

    diffstat:
    qeth_main.c | 49 ++++---------------------------------------------
    qeth_proc.c | 18 +++++++++---------
    qeth_sys.c | 2 +-
    3 files changed, 14 insertions(+), 55 deletions(-)
    Signed-off-by: Jeff Garzik

    Frank Pavlic
     
  • [patch 2/6] s390: qeth driver statistics fixes

    From: Ursula Braun
    - display "unsigned int" values in /proc/qeth_perf with %u instead of %i
    - omit qdio header length when increasing card->stats.tx_bytes

    Signed-off-by: Frank Pavlic

    diffstat:
    qeth_main.c | 3 ++-
    qeth_proc.c | 38 +++++++++++++++++++-------------------
    2 files changed, 21 insertions(+), 20 deletions(-)
    Signed-off-by: Jeff Garzik

    Frank Pavlic
     
  • With Au1xx0 Ethernet driver, TX bytes/packets always remain zero. The
    problem seems to be that when packet has been transmitted, the length word
    in DMA buffer is zero.

    The patch updates the TX stats when a buffer is fed to DMA. The initial
    2.4 patch was posted to linux-mips@linux-mips.org by Thomas Lange 21 Jan
    2005.

    Signed-off-by: Thomas Lange
    Signed-off-by: Sergei Shtylyov
    Cc: Jordan Crouse
    Cc: Jeff Garzik
    Signed-off-by: Andrew Morton
    Signed-off-by: Jeff Garzik

    Sergei Shtylylov
     
  • Signed-off-by: Jens Osterkamp
    Signed-off-by: Andrew Morton
    Signed-off-by: Jeff Garzik

    Jens Osterkamp
     
  • Now that libata is smart enought to handle both soft and hard resets,
    add softreset method.

    Signed-off-by: Tejun Heo
    Signed-off-by: Jeff Garzik

    Tejun Heo
     
  • As libata now can do PIO, don't ignore PIO-only devices.

    Signed-off-by: Tejun Heo
    Signed-off-by: Jeff Garzik

    Tejun Heo
     
  • Signed-off-by: Alan Cox
    Signed-off-by: Jeff Garzik

    Alan Cox
     
  • Not much to say here except that some drives have fixed and bad firmware

    Signed-off-by: Alan Cox
    Signed-off-by: Jeff Garzik

    Alan Cox
     
  • The current code follows the spec but uses an overlong delay. This would
    be great if the hardware did. Several vendors however forget the D7
    pulldown. Fortunately 0xFF isnt a sane reset state so we can use it to
    skip detection as is done in drivers/ide. (ie this is a tested solution
    over a long time)

    Signed-off-by: Alan Cox
    Signed-off-by: Jeff Garzik

    Alan Cox
     
  • Signed-off-by: Alan Cox
    Signed-off-by: Jeff Garzik

    Alan Cox
     
  • Jeff Garzik
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa: (124 commits)
    [ALSA] version 1.0.11rc4
    [PATCH] Intruduce DMA_28BIT_MASK
    [ALSA] hda-codec - Add support for ASUS P4GPL-X
    [ALSA] hda-codec - Add support for HP nx9420 laptop
    [ALSA] Fix memory leaks in error path of control.c
    [ALSA] AMD Au1x00: AC'97 controller is memory mapped
    [ALSA] AMD Au1x00: fix DMA init/cleanup
    [ALSA] hda-codec - Fix generic auto-configurator
    [ALSA] hda-codec - Fix BIOS auto-configuration
    [ALSA] Fixes typos in Audiophile-USB.txt
    [ALSA] ice1712 - typo fixes for dxr_enable module option
    [ALSA] AMD Au1x00: make driver build after cleanup
    [ALSA] ice1712 - Fix wrong value types for enum items
    [ALSA] fix resource leak in usbmixer
    [ALSA] Fix gus_pcm dereference before NULL
    [ALSA] Fix seq_clientmgr dereferences before NULL check
    [ALSA] hda-codec - Fix for Samsung R65 and ASUS A6J
    [ALSA] hda-codec - Add support for VAIO FE550G and SZ110
    [ALSA] usb-audio: add Maya44 mixer control names
    [ALSA] usb-audio: add Casio PL-40R support
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
    fixed path to moved file in include/linux/device.h
    Fix spelling in E1000_DISABLE_PACKET_SPLIT Kconfig description
    Documentation/dvb/get_dvb_firmware: fix firmware URL
    Documentation: Update to BUG-HUNTING
    Remove superfluous NOTIFY_COOKIE_LEN define
    add "tags" to .gitignore
    Fix "frist", "fisrt", typos
    fix rwlock usage example
    It's UTF-8

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
    [SPARC64]: Add a secondary TSB for hugepage mappings.
    [SPARC]: Respect vm_page_prot in io_remap_page_range().

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
    [TG3]: Bump driver version and reldate.
    [TG3]: Skip phy power down on some devices
    [TG3]: Fix SRAM access during tg3_init_one()
    [X25]: dte facilities 32 64 ioctl conversion
    [X25]: allow ITU-T DTE facilities for x25
    [X25]: fix kernel error message 64 bit kernel
    [X25]: ioctl conversion 32 bit user to 64 bit kernel
    [NET]: socket timestamp 32 bit handler for 64 bit kernel
    [NET]: allow 32 bit socket ioctl in 64 bit kernel
    [BLUETOOTH]: Return negative error constant

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (138 commits)
    [SCSI] libata: implement minimal transport template for ->eh_timed_out
    [SCSI] eliminate rphy allocation in favour of expander/end device allocation
    [SCSI] convert mptsas over to end_device/expander allocations
    [SCSI] allow displaying and setting of cache type via sysfs
    [SCSI] add scsi_mode_select to scsi_lib.c
    [SCSI] 3ware 9000 add big endian support
    [SCSI] qla2xxx: update MAINTAINERS
    [SCSI] scsi: move target_destroy call
    [SCSI] fusion - bump version
    [SCSI] fusion - expander hotplug suport in mptsas module
    [SCSI] fusion - exposing raid components in mptsas
    [SCSI] fusion - memory leak, and initializing fields
    [SCSI] fusion - exclosure misspelled
    [SCSI] fusion - cleanup mptsas event handling functions
    [SCSI] fusion - removing target_id/bus_id from the VirtDevice structure
    [SCSI] fusion - static fix's
    [SCSI] fusion - move some debug firmware event debug msgs to verbose level
    [SCSI] fusion - loginfo header update
    [SCSI] add scsi_reprobe_device
    [SCSI] megaraid_sas: fix extended timeout handling
    ...

    Linus Torvalds
     

22 Mar, 2006

3 commits

  • set_page_count usage outside mm/ is limited to setting the refcount to 1.
    Remove set_page_count from outside mm/, and replace those users with
    init_page_count() and set_page_refcounted().

    This allows more debug checking, and tighter control on how code is allowed
    to play around with page->_count.

    Signed-off-by: Nick Piggin
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Nick Piggin
     
  • sg increments the refcount of constituent pages in its higher order memory
    allocations when they are about to be mapped by userspace. This is done so
    the subsequent get_page/put_page when doing the mapping and unmapping does not
    free the page.

    Move over to the preferred way, that is, using compound pages instead. This
    fixes a whole class of possible obscure bugs where a get_user_pages on a
    constituent page may outlast the user mappings or even the driver.

    Signed-off-by: Nick Piggin
    Cc: Hugh Dickins
    Cc: Douglas Gilbert
    Cc: James Bottomley
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Nick Piggin
     
  • SLAB_NO_REAP is documented as an option that will cause this slab not to be
    reaped under memory pressure. However, that is not what happens. The only
    thing that SLAB_NO_REAP controls at the moment is the reclaim of the unused
    slab elements that were allocated in batch in cache_reap(). Cache_reap()
    is run every few seconds independently of memory pressure.

    Could we remove the whole thing? Its only used by three slabs anyways and
    I cannot find a reason for having this option.

    There is an additional problem with SLAB_NO_REAP. If set then the recovery
    of objects from alien caches is switched off. Objects not freed on the
    same node where they were initially allocated will only be reused if a
    certain amount of objects accumulates from one alien node (not very likely)
    or if the cache is explicitly shrunk. (Strangely __cache_shrink does not
    check for SLAB_NO_REAP)

    Getting rid of SLAB_NO_REAP fixes the problems with alien cache freeing.

    Signed-off-by: Christoph Lameter
    Cc: Pekka Enberg
    Cc: Manfred Spraul
    Cc: Mark Fasheh
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Christoph Lameter