1. 30 5月, 2007 13 次提交
    • M
      random: fix error in entropy extraction · 602b6aee
      Matt Mackall 提交于
      Fix cast error in entropy extraction.
      Add comments explaining the magic 16.
      Remove extra confusing loop variable.
      Signed-off-by: NMatt Mackall <mpm@selenic.com>
      Acked-by: N"Theodore Ts'o" <tytso@mit.edu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      602b6aee
    • L
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · f717221b
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
        IB/mlx4: Fix last allocated object tracking in bitmap allocator
        IB/cm: Fix stale connection detection
        IPoIB/cm: Fix performance regression on Mellanox
        IB/mthca: Fix handling of send CQE with error for QPs connected to SRQ
      f717221b
    • T
      NOHZ: prevent multiplication overflow - stop timer for huge timeouts · eaad084b
      Thomas Gleixner 提交于
      get_next_timer_interrupt() returns a delta of (LONG_MAX > 1) in case
      there is no timer pending. On 64 bit machines this results in a
      multiplication overflow in tick_nohz_stop_sched_tick().
      
      Reported by: Dave Miller <davem@davemloft.net>
      
      Make the return value a constant and limit the return value to a 32 bit
      value.
      
      When the max timeout value is returned, we can safely stop the tick
      timer device. The max jiffies delta results in a 12 days timeout for
      HZ=1000.
      
      In the long term the get_next_timer_interrupt() code needs to be
      reworked to return ktime instead of jiffies, but we have to wait until
      the last users of the original NO_IDLE_HZ code are converted.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Acked-off-by: NDavid S. Miller <davem@davemloft.net>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      eaad084b
    • R
      IB/mlx4: Fix last allocated object tracking in bitmap allocator · a2cb4a98
      Roland Dreier 提交于
      Set last allocated object to the object after the one just allocated
      before ORing in the extra top bits.  Also handle the case where this
      wraps around.
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      a2cb4a98
    • S
      IB/cm: Fix stale connection detection · d998ccce
      Sean Hefty 提交于
      The ib_cm can incorrectly detect a stale connection (a new connection
      request for a QPN that is already connected) as a duplicate connection
      request.  Separate the handling of potential duplicate REQs from stale
      connections.
      Signed-off-by: NSean Hefty <sean.hefty@intel.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      d998ccce
    • M
      IPoIB/cm: Fix performance regression on Mellanox · ec56dc0b
      Michael S. Tsirkin 提交于
      commit 518b1646 ("IPoIB/cm: Fix SRQ WR leak") introduced a severe
      performance regression on Mellanox cards, because keeping a QP in the
      error state for extended periods of time moves hardware to the slow
      path (until the QP is destroyed).  For example, MPI latency goes from
      ~3 usecs to ~7 usecs.
      
      Fix this by posting a send WR on one of the QPs that are being
      flushed, instead of using a separate drain QP that is kept in the
      error state.
      
      This fixes bug <https://bugs.openfabrics.org/show_bug.cgi?id=636>,
      reported and bisected by Scott Weitzenkamp at Cisco and debugged by
      Sasha Mikheev at Voltaire.
      Signed-off-by: NMichael S. Tsirkin <mst@dev.mellanox.co.il>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      ec56dc0b
    • M
      IB/mthca: Fix handling of send CQE with error for QPs connected to SRQ · 8b7e1577
      Michael S. Tsirkin 提交于
      mthca_free_err_wqe() currently treats both send and receive CQEs
      identically if a QP is using an SRQ.  But for Tavor hardware, send
      CQEs with error can be chained together even if the RQ is part of SRQ,
      so we may miss some CQEs.
      
      Fix by following the WQE chain for all send CQEs even for non-SRQ QPs.
      
      This fixes crashes in IPoIB CM:
      <https://bugs.openfabrics.org//show_bug.cgi?id=604>
      Signed-off-by: NMichael S. Tsirkin <mst@dev.mellanox.co.il>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      8b7e1577
    • L
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 6e98ee75
      Linus Torvalds 提交于
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Fill holes in hypervisor APIs and fix KTSB registry.
        [SPARC64]: Fix two bugs wrt. kernel 4MB TSB.
        [SPARC]: Mark as emulating cmpxchg, add appropriate depends for DRM.
        [SPARC]: Emulate cmpxchg like parisc
        [SPARC64]: Fix _PAGE_EXEC_4U check in sun4u I-TLB miss handler.
        [SPARC]: Linux always started with 9600 8N1
        [SPARC64]: arch/sparc64/time.c doesn't compile on Ultra 1 (no PCI)
        [SPARC64]: Eliminate NR_CPUS limitations.
        [SPARC64]: Use machine description and OBP properly for cpu probing.
        [SPARC64]: Negotiate hypervisor API for PCI services.
        [SPARC64]: Report proper system soft state to the hypervisor.
        [SPARC64]: Fix typo in sun4v_hvapi_register error handling.
        [SCSI] ESP: Kill SCSI_ESP_CORE and link directly just like jazz_esp
        [SCSI] jazz_esp: Converted to use esp_core.
        [SPARC64]: PCI device scan is way too verbose by default.
        [SERIAL] sunzilog: section mismatch fix
        [SPARC32]: Removes mismatch section warnigs in sparc time.c file
        [SPARC64]: Don't be picky about virtual-dma values on sun4v.
        [SPARC64]: Kill unused DIE_PAGE_FAULT enum value.
        [SCSI] pluto: Use wait_for_completion_timeout.
      6e98ee75
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 486b4ce1
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        firewire: fix return code
        firewire: prefix modules with firewire- instead of fw-
        firewire: Add missing byteswapping for receive DMA programs.
        ieee1394: raw1394: Fix async send
        ieee1394: eth1394: bring back a parent device
        ieee1394: eth1394: handle tlabel exhaustion
        ieee1394: eth1394: remove bogus netif_wake_queue
        ieee1394: sbp2: include workqueue.h
      486b4ce1
    • L
      Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · 358a9afc
      Linus Torvalds 提交于
      * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        hwmon/applesmc: Handle name file creation error and deletion
        hwmon/applesmc: Simplify dependencies
        hwmon-vid: Don't spam the logs when VRM version is missing
        hwmon/w83627hf: Be quiet when no chip is found
        hwmon/coretemp: Add more safety checks
        hwmon/ds1621: Fix swapped temperature limits
      358a9afc
    • L
      Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc · 55663219
      Linus Torvalds 提交于
      * 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
        [POWERPC] Fix Kconfig warning
        [PPC] Fix modpost warning
        [POWERPC] Fix modpost warning
        [POWERPC] Fix Section mismatch warnings
        [POWERPC] QE: fix Kconfig 'select' warning with UCC_FAST
        [POWERPC] 52xx: unbreak lite5200 dts (_pic vs. -pic)
        [PPC] Remove duplicate export of __div64_32.
        [PPC] Fix COMMON symbol warnings
      55663219
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · a4326635
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
        [SCSI] megaraid_sas: intercept cmd timeout and throttle io
        [SCSI] fusion: Fix |/|| confusion
        [SCSI] aic94xx: asd_clear_nexus should fail if the cleared task does not complete
        [SCSI] aic7xxx: fix aicasm build failure with gcc-3.4.6
        [SCSI] aacraid: apply commit config for reset_devices flag
        [SCSI] sd: fix refcounting regression in suspend/resume routines
        [SCSI] aacraid: fix panic on short Inquiry
        [SCSI] aacraid: Correct sa platform support. (Was: [Bug 8469] Bad EIP value on pentium3 SMP kernel-2.6.21.1)
        [SCSI] NCR53C9x: correct spelling mistake in deprecation notice
        [SCSI] tgt: fix a rdma indirect transfer error bug
        [SCSI] MegaRAID: Update MAINTAINERS email-id
        [SCSI] stex: minor cleanup and version update
        [SCSI] stex: fix reset recovery for console device
        [SCSI] stex: extend hard reset wait time
        [SCSI] stex: fix id mapping issue
        [SCSI] ipr: Proper return codes for eh_dev_reset for SATA devices
        [SCSI] zfcp: IO stall after deleting and path checker changes after reenabling zfcp devices
        [SCSI] zfcp: avoid clutter in erp_dbf
      a4326635
    • A
      USB: replace flush_workqueue with cancel_sync_work · d5d4db70
      Alan Stern 提交于
      This patch (as912) replaces a couple of calls to flush_workqueue()
      with cancel_sync_work() and cancel_rearming_delayed_work().  Using a
      more directed approach allows us to avoid some nasty deadlocks.  The
      prime example occurs when a first-level device (the parent is a root
      hub) is removed while at the same time the root hub gets a remote
      wakeup request.  khubd would try to flush the autosuspend workqueue
      while holding the root-hub's lock, and the remote-wakeup workqueue
      routine would be waiting to lock the root hub.
      
      The patch also reorganizes the power management portion of
      usb_disconnect(), separating it out into its own routine.  The
      autosuspend workqueue entry is cancelled immediately instead of
      waiting for the device's release routine.  In addition,
      synchronization with the autosuspend thread is carried out even for
      root hubs (an oversight in the original code).
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Greg KH <gregkh@suse.de>
      Cc: Mark Lord <lkml@rtr.ca>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d5d4db70
  2. 29 5月, 2007 20 次提交
  3. 28 5月, 2007 7 次提交