Permalink
Switch branches/tags
Commits on Jul 19, 2007
  1. Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/…

    Linus Torvalds committed Jul 19, 2007
    …davem/net-2.6
    
    * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
      [TG3]: Fix msi issue with kexec/kdump.
      [NET] XFRM: Fix whitespace errors.
      [NET] TIPC: Fix whitespace errors.
      [NET] SUNRPC: Fix whitespace errors.
      [NET] SCTP: Fix whitespace errors.
      [NET] RXRPC: Fix whitespace errors.
      [NET] ROSE: Fix whitespace errors.
      [NET] RFKILL: Fix whitespace errors.
      [NET] PACKET: Fix whitespace errors.
      [NET] NETROM: Fix whitespace errors.
      [NET] NETFILTER: Fix whitespace errors.
      [NET] IPV4: Fix whitespace errors.
      [NET] DCCP: Fix whitespace errors.
      [NET] CORE: Fix whitespace errors.
      [NET] BLUETOOTH: Fix whitespace errors.
      [NET] AX25: Fix whitespace errors.
      [PATCH] mac80211: remove rtnl locking in ieee80211_sta.c
      [PATCH] mac80211: fix GCC warning on 64bit platforms
      [GENETLINK]: Dynamic multicast groups.
      [NETLIKN]: Allow removing multicast groups.
      ...
  2. IDE: fix termination of non-fs requests

    Jens Axboe committed with Linus Torvalds Jul 19, 2007
    ide-disk calls
    
            ide_end_request(drive, 0, 0);
    
    to finish an unknown request, but this doesn't work so well for non-fs
    requests, since ide_end_request() internally looks at ->hard_cur_sectors
    to see how much data to end. Only file system requests store a transfer
    value in there, pc requests fill out ->data_len as a byte based transfer
    value instead.
    
    Since we ask to end 0 bytes of that request, it will never be terminated
    and ide-disk gets stuck in a loop "handling" that same request over and
    over.
    
    Switch __ide_end_request() to take a byte based transfer count, and
    adjust ide_end_request() to look at the right field to determine how
    much IO to end when it's being passed in 0.
    
    Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Tested-By: Giacomo Catenazzi <cate@debian.org>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. afs build fix

    akpm00 committed with Linus Torvalds Jul 19, 2007
    Bruce and David's patches clashed.
    
    fs/afs/flock.c: In function 'afs_do_getlk':
    fs/afs/flock.c:459: error: void value not ignored as it ought to be
    
    Cc: "J. Bruce Fields" <bfields@fieldses.org>
    Acked-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. kernel/sysctl.c: finish off the warning comments

    akpm00 committed with Linus Torvalds Jul 19, 2007
    I've been chasing these comments around this file all week.  Hopefully we're
    straight now.
    
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. drivers/edac: add to edac docs

    Doug Thompson committed with Linus Torvalds Jul 19, 2007
    Updated the EDAC kernel documentation
    
    Signed-off-by:	Doug Thompson <dougthompson@xmission.com>
    Cc: Greg KH <greg@kroah.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. drivers/edac: fix edac_device sysfs corner case bug

    Doug Thompson committed with Linus Torvalds Jul 19, 2007
    Some simple fixes to properly reference counter values from the block
    attribute level of edac_device objects.  Properly sequencing the array pointer
    was added, resulting in correct identification of block level attributes from
    their base class functions.
    
    Added more verbose debug statement for event tracking.
    
    Also during some corner testing, found a bug in the store/show sequence
    of operations for the block attribute/controls management.
    
    An old intermediate structure for 'blocks' was still in the processing
    pipeline.  This patch removes that old structure and correctly utilizes the
    new struct edac_dev_sysfs_block_attribute for passing control from the sysfs
    to the low level store/show function of the edac driver.
    
    Now the proper kobj pointer to passed downward to the store/show
    functions.
    
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Cc: Greg KH <greg@kroah.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. drivers/edac: add to maintainers new info

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    Update maintainer information on edac components
    
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Cc: Greg KH <greg@kroah.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. drivers/edac: new i82975x driver

    Ranganathan Desikan committed with Linus Torvalds Jul 19, 2007
    New EDAC driver for the i82975x memory controller chipset Used on ASUS
    motherboards
    
    [akpm@linux-foundation.org: fix multiple coding-style bloopers]
    Signed-off-by: <arvind@acarlab.com>
    Signed-off-by: Ranganathan Desikan <rdesikan@jetzbroadband.com>
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Cc: Greg KH <greg@kroah.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. drivers/edac: fix workq reset deadlock

    Doug Thompson committed with Linus Torvalds Jul 19, 2007
    Fix mutex locking deadlock on the device controller linked list.  Was calling
    a lock then a function that could call the same lock.  Moved the cancel workq
    function to outside the lock
    
    Added some short circuit logic in the workq code
    
    Added comments of description
    
    Code tidying
    
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Cc: Greg KH <greg@kroah.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Cc: Oleg Nesterov <oleg@tv-sign.ru>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. drivers/edac: code tidying on export-gpl

    Doug Thompson committed with Linus Torvalds Jul 19, 2007
    Change EXPORT_SYMBOLs to EXPORT_SYMBOLS_GPL
    Tidy changes: blank lines, inline removal, add comment
    
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Cc: Greg KH <greg@kroah.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. drivers/edac: fix edac_device sysfs completion code

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    With feedback, this patch corrects operation of the kobject release operation
    on kobjects, attributes and controls for the edac_device.
    
    Cc: Alan Cox alan@lxorguk.ukuu.org.uk
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Acked-by: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. drivers/edac: fix edac_mc sysfs completion code

    Doug Thompson committed with Linus Torvalds Jul 19, 2007
    This patch refactors the 'releasing' of kobjects for the edac_mc type of
    device.  The correct pattern of kobject release is followed.
    
    As internal kobjs are allocated they bump a ref count on the top level kobj.
    It in turn has a module ref count on the edac_core module.  When internal
    kobjects are released, they dec the ref count on the top level kobj.  When the
    top level kobj reaches zero, it decrements the ref count on the edac_core
    object, allow it to be unloaded, as all resources have all now been released.
    
    Cc: Alan Cox alan@lxorguk.ukuu.org.uk
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Acked-by: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. drivers/edac: fix edac_device init apis

    Doug Thompson committed with Linus Torvalds Jul 19, 2007
    Refactoring of sysfs code necessitated the refactoring of the
    edac_device_alloc() and edac_device_add_device() apis, of moving the index
    value to the alloc() function.  This patch alters the in tree drivers to
    utilize this new api signature.
    
    Having the index value performed later created a chicken-and-the-egg issue.
    Moving it to the alloc() function allows for creating the necessary sysfs
    entries with the proper index number
    
    Cc: Alan Cox alan@lxorguk.ukuu.org.uk
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. drivers/edac: fix edac_mc init apis

    Doug Thompson committed with Linus Torvalds Jul 19, 2007
    Refactoring of sysfs code necessitated the refactoring of the edac_mc_alloc()
    and edac_mc_add_mc() apis, of moving the index value to the alloc() function.
    This patch alters the in tree drivers to utilize this new api signature.
    
    Having the index value performed later created a chicken-and-the-egg issue.
    Moving it to the alloc() function allows for creating the necessary sysfs
    entries with the proper index number
    
    Cc: Alan Cox alan@lxorguk.ukuu.org.uk
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. drivers/edac: fix leaf sysfs attribute

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    This patch fixes and enhances the driver level set of sysfs attributes that
    can be added to the 'block' level of an edac_device type of driver.
    
    There is a controller information structure, which contains one or more
    instances of device.  Each instance will have one or more blocks of device
    specific counters.  This patch fixes the ability to have more detailed
    attributes/controls for each of the 'blocks', providing for the addition of
    controls/attributes from the low level driver to user space via sysfs.
    
    Cc: Alan Cox alan@lxorguk.ukuu.org.uk
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. drivers/edac: new pasemi driver

    Egor Martovetsky committed with Linus Torvalds Jul 19, 2007
    NEW EDAC driver for the memory controllers on PA Semi PA6T-1682M.
    
    Changes since last submission:
    
    * Rebased on top of 2.6.22-rc4-mm2 with the EDAC changes merged there.
    * Minor checkpatch.pl cleanups
    * Renamed ctl_name
    * Added dev_name
    * edac_mc.h -> edac_core.h
    
    [akpm@linux-foundation.org: make printk more informative]
    Cc: Alan Cox alan@lxorguk.ukuu.org.uk
    Signed-off-by: Egor Martovetsky <egor@pasemi.com>
    Signed-off-by: Olof Johansson <olof@lixom.net>
    Signed-off-by: Doug Thompson <dougthompson@xmission.com
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. drivers/edac: fix e752x reversed csrows

    grondo committed with Linus Torvalds Jul 19, 2007
    Found a 'reversal' decoding bug in the driver.  This patch fixes that mapping
    to correctly display the CSROW entries in their proper order.  Users will be
    enable to correctly identifiy the failing DIMM with this fix.
    
    [akpm@linux-foundation.org: unneeded (and undesirable) cast of void*]
    Cc: Alan Cox alan@lxorguk.ukuu.org.uk
    Signed-off-by: Mark Grondona <mgrondona@llnl.gov>
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. drivers/edac: fix edac_device semaphore to mutex

    Doug Thompson committed with Linus Torvalds Jul 19, 2007
    A previous patch changed the edac_mc src file from semaphore usage to mutex
    This patch changes the edac_device src file as well, from semaphore use to
    mutex operation.
    
    Use a mutex primitive for mutex operations, as it does not require a
    semaphore
    
    Cc: Alan Cox alan@lxorguk.ukuu.org.uk
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  19. drivers/edac: remove file edac_mc.h

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    Removed the no-longer-needed file edac_mc.h
    
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  20. drivers/edac: mod edac_opt_state_to_string function

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    Refactored the function edac_op_state_toString() to be edac_op_state_to_string()
    for consistent style, and its callers
    
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. drivers/edac: mod edac_align_ptr function

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    Refactor the edac_align_ptr() function to reduce the noise of casting the
    aligned pointer to the various types of data objects and modified its callers
    to its new signature
    
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22. drivers/edac: edac_device code tidying

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    For the file edac_device.c perform some coding style enhancements
    Add some function header comments
    Made for better readability commands
    
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  23. drivers/edac: i5000 code tidying

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    Various code style conformance patches on the i5000 driver
    
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  24. drivers/edac: remove null from statics

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    Patches to conform to coding style, namely static don't need to be initialized
    to NULL nor '0', as that is the default
    
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  25. drivers/edac: i5000 define typo

    Marisuz Kozlowski committed with Linus Torvalds Jul 19, 2007
    Found a typo in one of the #defines in the driver
    
    MTR_DIM_RANKS --> MTR_DIMM_RANK
    
    Signed-off-by: Marisuz Kozlowski <m.kozlowski@tuxland.pl>
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  26. include/linux/pci_id.h: add amd northbridge defines

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    pci_ids.h needs two of the AMD NB device-ids namely, Addressmap and the Memory
    Controller devices
    
    This patch adds those to the pci_id.h include file
    
    Signed-off-by:	Douglas Thompson <dougthompson@xmission.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  27. drivers/edac: fix ignored return i82875p

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    Compiling this module gave a warning that the return value of
    'pci_bus_add_device()' was not checked.
    
    This patch adds that check and an output message
    
    Signed-off-by:	Douglas Thompson <dougthompson@xmission.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  28. drivers/edac: mod race fix i82875p

    Jason Uhlenkott committed with Linus Torvalds Jul 19, 2007
    If ERRSTS indicates that there's no error then we don't need to bother reading
    the other registers.
    
    In addition to making the common case faster, this actually fixes a small race
    where we don't see an error but we clear the error bits anyway, potentially
    wiping away info on an error that happened in the interim (or where a CE
    arrives between the first and second read of ERRSTS, causing us to falsely
    claim "UE overwrote CE").
    
    Signed-off-by: Jason Uhlenkott <juhlenko@akamai.com>
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  29. drivers/edac: add mips and ppc visibility

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    1) Remove an old CVS ID string
    
    2) change EDAC from a tristate option to a simple bool option
    
    3) In addition to the X86 arch, PPC and MIPS also have drivers in the
    submission queue.  This patch turns on the EDAC flag for those archs.  Each
    driver will have its respective 'depends on ARCH' set.
    
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  30. drivers/edac: cleanup spaces-gotos after Lindent messup

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    This patch fixes some remnant spaces inserted by the use of Lindent.
    Seems Lindent adds some spaces when it shoulded. These have been fixed.
    In addition, goto targets have issues, these have been fixed
    in this patch.
    
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  31. drivers/edac: update MAINTAINERS files for EDAC

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    Added new maintainers for the new EDAC drivers.
    
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  32. drivers/edac: add info kconfig

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    Kconfig - modified the help of EDAC
    
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  33. drivers/edac: device output clenaup

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    The error handling output strings needed to be refactored for better
    displaying of the error informaton.
    
    Also needed to added offset_value for output as well
    
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  34. drivers/edac: add device sysfs attributes

    Douglas Thompson committed with Linus Torvalds Jul 19, 2007
    Added new controls for the edac_device and edac_mc sysfs folder.
    These can be initialized by the low level driver to provide misc
    controls into the low level driver for its use
    
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  35. drivers/edac: drivers to use new PCI operation

    Dave Jiang committed with Linus Torvalds Jul 19, 2007
    Move x86 drivers to new pci controller setup
    
    Signed-off-by: Dave Jiang <djiang@mvista.com>
    Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>