1. 15 May, 2006 12 commits
  2. 13 May, 2006 2 commits
    • Linus Torvalds's avatar
      Revert "[PATCH] i386: export: memory more than 4G through /proc/iomem" · 9be2f7c3
      Linus Torvalds authored
      This reverts commit 10dbe196.
      
      The resource struct is still 32-bit, so trying to save a 64-bit memory
      size there obviously won't work.
      
      When we merge the 64-bit resource series, we can re-enable this.
      
      Thanks to Sachin Sant and Maneesh Soni for debugging
      
      Cc: Maneesh Soni <maneesh@in.ibm.com>
      Cc: Sachin Sant <sachinp@in.ibm.com>
      Cc: Russell King <rmk+lkml@arm.linux.org.uk>
      Cc: Sharyathi Nagesh <sharyath@in.ibm.com>
      Cc: Arjan van de Ven <arjan@infradead.org>
      Cc: Vivek Goyal <vgoyal@in.ibm.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      9be2f7c3
    • Linus Torvalds's avatar
      Alternative fix for MMC oops on unmount after removal · 032ebf26
      Linus Torvalds authored
      Make sure to clear the driverfs_dev pointer when we do del_gendisk() (on
      disk removal), so that other users that may still have a ref to the disk
      won't try to use the stale pointer.
      
      Also move the KOBJ_REMOVE uevent handler up, so that the uevent still
      has access to the driverfs_dev data.
      
      This all should hopefully fix the problems with MMC umounts after device
      removals that caused commit 56cf6504 and
      its reversal (1a2acc9e).
      
      Original problem reported by Todd Blumer and others.
      Acked-by: default avatarGreg KH <gregkh@suse.de>
      Cc: Russell King <rmk+lkml@arm.linux.org.uk>
      Cc: James Bottomley <James.Bottomley@SteelEye.com>
      Cc: Erik Mouw <erik@harddisk-recovery.com>
      Cc: Andrew Vasquez <andrew.vasquez@qlogic.com>
      Cc: Todd Blumer <todd@sdgsystems.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      032ebf26
  3. 12 May, 2006 18 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 18552b8f
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [NEIGH]: Fix IP-over-ATM and ARP interaction.
        [TG3]: ethtool always report port is TP.
      18552b8f
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · faa88df8
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC]: Fix warning on prom_getproperty in openprom.c
        [SPARC]: Handle UNWIND_INFO properly.
        [SPARC64]: Update defconfig.
        [SPARC]: show device name in /proc/dvma_map
        [SPARC]: Remove duplicate symbol exports
      faa88df8
    • Sean Hefty's avatar
      IB: refcount race fixes · 1b52fa98
      Sean Hefty authored
      Fix race condition during destruction calls to avoid possibility of
      accessing object after it has been freed.  Instead of waking up a wait
      queue directly, which is susceptible to a race where the object is
      freed between the reference count going to 0 and the wake_up(), use a
      completion to wait in the function doing the freeing.
      Signed-off-by: default avatarSean Hefty <sean.hefty@intel.com>
      Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
      1b52fa98
    • Roland Dreier's avatar
      IB/ipath: Properly terminate PCI ID table · 6f4bb3d8
      Roland Dreier authored
      The ipath driver's table of PCI IDs needs a { 0, } entry at the end.
      This makes all of the device aliases visible to userspace so hotplug
      loads the module for all supported devices.  Without the patch,
      modinfo ipath_core only shows:
      
          alias:          pci:v00001FC1d0000000Dsv*sd*bc*sc*i*
      
      instead of the correct:
      
          alias:          pci:v00001FC1d00000010sv*sd*bc*sc*i*
          alias:          pci:v00001FC1d0000000Dsv*sd*bc*sc*i*
      Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
      Signed-off-by: default avatarBryan O'Sullivan <bos@pathscale.com>
      6f4bb3d8
    • Simon Kelley's avatar
      [NEIGH]: Fix IP-over-ATM and ARP interaction. · bd89efc5
      Simon Kelley authored
      The classical IP over ATM code maintains its own IPv4 <-> <ATM stuff>
      ARP table, using the standard neighbour-table code. The
      neigh_table_init function adds this neighbour table to a linked list
      of all neighbor tables which is used by the functions neigh_delete()
      neigh_add() and neightbl_set(), all called by the netlink code.
      
      Once the ATM neighbour table is added to the list, there are two
      tables with family == AF_INET there, and ARP entries sent via netlink
      go into the first table with matching family. This is indeterminate
      and often wrong.
      
      To see the bug, on a kernel with CLIP enabled, create a standard IPv4
      ARP entry by pinging an unused address on a local subnet. Then attempt
      to complete that entry by doing
      
      ip neigh replace <ip address> lladdr <some mac address> nud reachable
      
      Looking at the ARP tables by using 
      
      ip neigh show
      
      will reveal two ARP entries for the same address. One of these can be
      found in /proc/net/arp, and the other in /proc/net/atm/arp.
      
      This patch adds a new function, neigh_table_init_no_netlink() which
      does everything the neigh_table_init() does, except add the table to
      the netlink all-arp-tables chain. In addition neigh_table_init() has a
      check that all tables on the chain have a distinct address family.
      The init call in clip.c is changed to call
      neigh_table_init_no_netlink().
      
      Since ATM ARP tables are rather more complicated than can currently be
      handled by the available rtattrs in the netlink protocol, no
      functionality is lost by this patch, and non-ATM ARP manipulation via
      netlink is rescued. A more complete solution would involve a rtattr
      for ATM ARP entries and some way for the netlink code to give
      neigh_add and friends more information than just address family with
      which to find the correct ARP table.
      
      [ I've changed the assertion checking in neigh_table_init() to not
        use BUG_ON() while holding neigh_tbl_lock.  Instead we remember that
        we found an existing tbl with the same family, and after dropping
        the lock we'll give a diagnostic kernel log message and a stack dump.
        -DaveM ]
      Signed-off-by: default avatarSimon Kelley <simon@thekelleys.org.uk>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bd89efc5
    • Martin Habets's avatar
    • Karsten Keil's avatar
      [TG3]: ethtool always report port is TP. · ef348144
      Karsten Keil authored
      Even with fiber cards ethtool reports that the connected port is TP,
      the patch fix this.
      Signed-off-by: default avatarKarsten Keil <kkeil@suse.de>
      Acked-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ef348144
    • David S. Miller's avatar
      [SPARC]: Handle UNWIND_INFO properly. · 06a1be16
      David S. Miller authored
      For sparc32 we need R_SPARC_UA32 relocation support, for
      sparc64 we need the handle R_SPARC_DISP32 relocations.
      
      Based upon reports and initial patch by Martin Habets.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      06a1be16
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 · be1fd94f
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6:
        [PATCH] scx200_acb: Fix for the CS5535 errata
        [PATCH] scx200_acb: Fix resource name use after free
        [PATCH] scx200_acb: Fix return on init error
      be1fd94f
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 0d38edda
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
        [PATCH] USB: fix omninet driver bug
        [PATCH] USB: add ark3116 usb to serial driver
        [PATCH] usbserial: Fixes leak in serial_open() error path.
        [PATCH] usbserial: Fixes use-after-free in serial_open().
        [PATCH] USB: Emagic USB firmware loading fixes
        [PATCH] USB: add an IBM USB keyboard to the HID_QUIRK_NOGET blacklist
        [PATCH] USB: Add Sieraa Wireless 580 evdo card to airprime.c
        [PATCH] USB: ftdi_sio: add device id for ACT Solutions HomePro ZWave interface
        [PATCH] USB: ftdi_sio: Add support for HCG HF Dual ISO RFID Reader
        [PATCH] USB: ub oops in block_uevent
        [PATCH] USB: usbcore: don't check the device's power source
        [PATCH] USB: fix OHCI PM regression
        [PATCH] USB: pegasus fixes (logstorm, suspend)
        [PATCH] USBATM: fix modinfo output
        [PATCH] USBATM: change the default speedtouch iso altsetting
        [PATCH] USB: fix bug in ohci-hcd.c ohci_restart()
      0d38edda
    • Linus Torvalds's avatar
      Revert "[BLOCK] Fix oops on removal of SD/MMC card" · 1a2acc9e
      Linus Torvalds authored
      This reverts commit 56cf6504.
      
      Both Erik Mouw and Andrew Vasquez independently pinpointed this commit
      as causing problems, where the slab cache for a driver is never released
      (most obviously causing problems when immediately re-loading that
      driver, resulting in a "kmem_cache_create: duplicate cache <xyz>"
      message, but it can also cause other trouble).
      
      James Bottomley dug into it, and reports:
      
        "OK, here's the scoop.  The problem patch adds a get of driverfs_dev in
         add_disk(), but doesn't put it again until disk_release() (which occurs
         on final put_disk() of the gendisk).
      
         However, in SCSI, the driverfs_dev is the sdev_gendev.  That means
         there's a reference held on sdev_gendev  until final disk put.
         Unfortunately, we use the driver model driver_remove to trigger
         del_gendisk (which removes the gendisk from visibility and decrements
         the refcount), so we've introduced an unbreakable deadlock in the
         reference counting with this.
      
         I suggest simply reversing this patch at the moment.  If Russell and
         Jens can tell me what they're trying to do I'll see if there's another
         way to do it."
      
      so hereby the patch gets reverted, waiting for a better fix.
      
      Cc: Jens Axboe <axboe@suse.de>
      Cc: Russell King <rmk@arm.linux.org.uk>
      Cc: James Bottomley <James.Bottomley@SteelEye.com>
      Cc: Erik Mouw <erik@harddisk-recovery.com>
      Cc: Andrew Vasquez <andrew.vasquez@qlogic.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      1a2acc9e
    • Greg Kroah-Hartman's avatar
      [PATCH] USB: fix omninet driver bug · df3fccb1
      Greg Kroah-Hartman authored
      I introduced this way back in 2.6.13 when adding the port lock logic.
      This device talks out through different "ports" all at the same time, so
      the lock logic was wrong, preventing any data from ever being sent
      properly.
      
      Thanks a lot to Bernhard Reiter <bernhard@intevation.de> for being
      patient and helping with debugging this.
      
      Cc: Bernhard Reiter <bernhard@intevation.de>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      df3fccb1
    • Greg Kroah-Hartman's avatar
      [PATCH] USB: add ark3116 usb to serial driver · 815ddc99
      Greg Kroah-Hartman authored
      Based on Simon's original driver, with some minor code cleanups and
      tidying by me.
      
      Cc: Simon Schulz <simon@auctionant.de>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      815ddc99
    • Luiz Fernando Capitulino's avatar
      [PATCH] usbserial: Fixes leak in serial_open() error path. · 71a84163
      Luiz Fernando Capitulino authored
      If serial_open() fails at the port assignment or mutex_lock_interruptible()
      is interrupted, the 'serial' object will never be freed.
      
      We should call kref_put() when those errors happens.
      Signed-off-by: default avatarLuiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      71a84163
    • Luiz Fernando Capitulino's avatar
      [PATCH] usbserial: Fixes use-after-free in serial_open(). · 704936a2
      Luiz Fernando Capitulino authored
      If the device is disconnected while serial_open() is executing and
      either try_module_get() or the device specific open function fails, the
      kref_put() call in the 'bailout_kref_put' label will free the memory
      pointed out by 'port'.
      
      The subsequent dereferences in the 'bailout_kref_put' label will be
      invalid.
      
      The fix is just to assure kref_put() is called after any 'port' usage.
      Signed-off-by: default avatarLuiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      704936a2
    • Monty's avatar
      [PATCH] USB: Emagic USB firmware loading fixes · 16c23f7d
      Monty authored
      It's become apparent as machines get faster that the emagic kernel firmware
      loaders (based on the ezusb loader) have a reset race.  a 400MHz TiBook
      never tripped it, but a 2GHz Pentium M seems to hit it about 30% of the
      time.  The bug is seen as a hung USB box and the kernel error:
      
      drivers/usb/misc/emi62.c: emi62_load_firmware - error loading firmware:
      error = -110
      
      The patch below inserts a delay after deasserting reset to allow the box to
      settle before a new command is issued.  This affects only device startup.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      16c23f7d
    • Olaf Hering's avatar
      [PATCH] USB: add an IBM USB keyboard to the HID_QUIRK_NOGET blacklist · 332bbf61
      Olaf Hering authored
      After recent changes, the USB keyboard as shipped with IBM pSeries systems
      does not work anymore, unless the keyboard is replugged after reboot.
      Adding this model to the blacklist fixes it.
      Signed-off-by: default avatarOlaf Hering <olh@suse.de>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      332bbf61
    • Ken Brush's avatar
      [PATCH] USB: Add Sieraa Wireless 580 evdo card to airprime.c · b68f7de0
      Ken Brush authored
      This adds the Sierra Wireless card to airprime.c.
      
      I tested this on my laptop.
      Signed-off-by: default avatarKen Brush <ken@cgi101.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      b68f7de0
  4. 11 May, 2006 8 commits
    • Linus Torvalds's avatar
      Linux v2.6.17-rc4 · d8c3291c
      Linus Torvalds authored
      d8c3291c
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · d649dafd
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3508/1: Update collie defconfig
        [ARM] Fix thread struct allocator for SMP case
        [ARM] Update mach-types
        [ARM] Update versatile_defconfig
      d649dafd
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-serial · 2bf9d6d0
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-serial:
        [SERIAL] 8250: add locking to console write function
        [SERIAL] Remove unconditional enable of TX irq for console
        [SERIAL] 8250: set divisor register correctly for AMD Alchemy SoC uart
        [SERIAL] AMD Alchemy UART: claim memory range
        [SERIAL] Clean up serial locking when obtaining a reference to a port
      2bf9d6d0
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 6572b206
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [NET_SCHED]: HFSC: fix thinko in hfsc_adjust_levels()
        [IPV6]: skb leakage in inet6_csk_xmit
        [BRIDGE]: Do sysfs registration inside rtnl.
        [NET]: Do sysfs registration as part of register_netdevice.
        [TG3]: Fix possible NULL deref in tg3_run_loopback().
        [NET] linkwatch: Handle jiffies wrap-around
        [IRDA]: Switching to a workqueue for the SIR work
        [IRDA]: smsc-ircc: Minimal hotplug support.
        [IRDA]: Removing unused EXPORT_SYMBOLs
        [IRDA]: New maintainer.
        [NET]: Make netdev_chain a raw notifier.
        [IPV4]: ip_options_fragment() has no effect on fragmentation
        [NET]: Add missing operstates documentation.
      6572b206
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · f7a014af
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (25 commits)
        [SCSI] mptfc: race between mptfc_register_dev and mptfc_target_alloc
        [SCSI] lpfc 8.1.6 : Fix Data Corruption in Bus Reset Path
        [SCSI] mptspi: revalidate negotiation parameters after host reset and resume
        [SCSI] srp.h: avoid padding of structs
        [SCSI] ibmvscsi: fix leak when failing to send srp event
        [SCSI] qla2xxx: Correct eh_abort recovery logic.
        [SCSI] megaraid_{mm,mbox}: fix a bug in reset handler
        [SCSI] fusion - bug fix stack overflow in mptbase
        [SCSI] scsi: Add IBM 2104-DU3 to blist
        [SCSI] Fix DVD burning issues.
        [SCSI] SCSI: aic7xxx_osm_pci resource leak fix.
        [SCSI] - fusion - mptfc bug fix's to prevent deadlock situations
        [SCSI] mptfusion: bug fix's for raid components adding/deleting
        [SCSI] aic7xxx: ahc_pci_write_config() fix
        [SCSI] megaraid: unused variable
        [SCSI] qla2xxx: only free_irq() after request_irq() succeeds
        [SCSI] Overrun in drivers/scsi/sim710.c
        [SCSI] lpfc 8.1.5 : Change version number to 8.1.5
        [SCSI] lpfc 8.1.5 : Misc small fixes
        [SCSI] lpfc 8.1.5 : Additional fixes to LOGO, PLOGI, and RSCN processing
        ...
      f7a014af
    • Jens Axboe's avatar
      [BLOCK] limit request_fn recursion · dac07ec1
      Jens Axboe authored
      Don't recurse back into the driver even if the unplug threshold is met,
      when the driver asks for a requeue. This is both silly from a logical
      point of view (requeues typically happen due to driver/hardware
      shortage), and also dangerous since we could hit an endless request_fn
      -> requeue -> unplug -> request_fn loop and crash on stack overrun.
      
      Also limit blk_run_queue() to one level of recursion, similar to how
      blk_start_queue() works.
      
      This patch fixed a real problem with SLES10 and lpfc, and it could hit
      any SCSI lld that returns non-zero from it's ->queuecommand() handler.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      dac07ec1
    • Patrick McHardy's avatar
      [NET_SCHED]: HFSC: fix thinko in hfsc_adjust_levels() · 210525d6
      Patrick McHardy authored
      When deleting the last child the level of a class should drop to zero.
      
      Noticed by Andreas Mueller <andreas@stapelspeicher.org>
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      210525d6
    • Linus Torvalds's avatar
      ptrace_attach: fix possible deadlock schenario with irqs · f358166a
      Linus Torvalds authored
      Eric Biederman points out that we can't take the task_lock while holding
      tasklist_lock for writing, because another CPU that holds the task lock
      might take an interrupt that then tries to take tasklist_lock for writing.
      
      Which would be a nasty deadlock, with one CPU spinning forever in an
      interrupt handler (although admittedly you need to really work at
      triggering it ;)
      
      Since the ptrace_attach() code is special and very unusual, just make it
      be extra careful, and use trylock+repeat to avoid the possible deadlock.
      
      Cc: Oleg Nesterov <oleg@tv-sign.ru>
      Cc: Eric W. Biederman <ebiederm@xmission.com>
      Cc: Roland McGrath <roland@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      f358166a