1. 02 2月, 2010 2 次提交
    • A
      MIPS: AR7: Fix USB slave mem range typo · ba284b1f
      Alexander Clouter 提交于
      Signed-off-by: NAlexander Clouter <alex@digriz.org.uk>
      To: linux-mips@linux-mips.org
      Patchwork: http://patchwork.linux-mips.org/patch/919/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      ba284b1f
    • M
      MIPS: Alchemy: Fix dbdma ring destruction memory debugcheck. · 22f4bb68
      Manuel Lauss 提交于
      DBDMA descriptors need to be located at 32-byte aligned addresses;
      however kmalloc in conjunction with the SLAB allocator and
      CONFIG_DEBUG_SLUB enabled doesn't deliver any.  The dbdma code works
      around that by allocating a larger area and realigning the start
      address within it.
      
      When freeing a channel however this adjustment is not taken into
      account which results in an oops:
      
      Kernel bug detected[#1]:
      [...]
      Call Trace:
      [<80186010>] cache_free_debugcheck+0x284/0x318
      [<801869d8>] kfree+0xe8/0x2a0
      [<8010b31c>] au1xxx_dbdma_chan_free+0x2c/0x7c
      [<80388dc8>] au1x_pcm_dbdma_free+0x34/0x4c
      [<80388fa8>] au1xpsc_pcm_close+0x28/0x38
      [<80383cb8>] soc_codec_close+0x14c/0x1cc
      [<8036dbb4>] snd_pcm_release_substream+0x60/0xac
      [<8036dc40>] snd_pcm_release+0x40/0xa0
      [<8018c7a8>] __fput+0x11c/0x228
      [<80188f60>] filp_close+0x7c/0x98
      [<80189018>] sys_close+0x9c/0xe4
      [<801022a0>] stack_done+0x20/0x3c
      
      Fix this by recording the address delivered by kmalloc() and using
      it as parameter to kfree().
      
      This fix is only necessary with the SLAB allocator and CONFIG_DEBUG_SLAB
      enabled;  non-debug SLAB, SLUB do return nicely aligned addresses,
      debug-enabled SLUB currently panics early in the boot process.
      Signed-off-by: NManuel Lauss <manuel.lauss@gmail.com>
      To: Linux-MIPS <linux-mips@linux-mips.org>
      Cc: Manuel Lauss <manuel.lauss@gmail.com>
      Patchwork: http://patchwork.linux-mips.org/patch/878/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      22f4bb68
  2. 28 1月, 2010 4 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · be8cde8b
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
        [SCSI] aic79xx: check for non-NULL scb in ahd_handle_nonpkt_busfree
        [SCSI] zfcp: Set hardware timeout as requested by BSG request.
        [SCSI] zfcp: Introduce bsg_timeout callback.
        [SCSI] scsi_transport_fc: Allow LLD to reset FC BSG timeout
        [SCSI] zfcp: add missing compat ptr conversion
        [SCSI] zfcp: Fix linebreak in hba trace
        [SCSI] zfcp: Issue zfcp_fc_wka_port_put after FC CT BSG request
        [SCSI] qla2xxx: Update version number to 8.03.01-k10.
        [SCSI] fc-transport: Use packed modifier for fc_bsg_request structure.
        [SCSI] qla2xxx: Perform fast mailbox read of flash regardless of size nor address alignment.
        [SCSI] qla2xxx: Correct FCP2 recovery handling.
        [SCSI] scsi_lib: Fix bug in completion of bidi commands
        [SCSI] mptsas: Fix issue with chain pools allocation on katmai
        [SCSI] aacraid: fix File System going into read-only mode
        [SCSI] lpfc: fix file permissions
      be8cde8b
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 981a2edd
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
        [S390] fix single stepped svcs with TRACE_IRQFLAGS=y
        [S390] zcrypt: Do not remove coprocessor for error 8/72
        [S390] sclp_vt220: set initial terminal window size
        [S390] use set_current_state in sigsuspend
        [S390] irqflags: add missing types.h include
        [S390] dasd: fix possible NULL pointer errors
      981a2edd
    • C
      drm/i915: Selectively enable self-reclaim · 4bdadb97
      Chris Wilson 提交于
      Having missed the ENOMEM return via i915_gem_fault(), there are probably
      other paths that I also missed. By not enabling NORETRY by default these
      paths can run the shrinker and take memory from the system (but not from
      our own inactive lists because our shrinker can not run whilst we hold
      the struct mutex) and this may allow the system to survive a little longer
      whilst our drivers consume all available memory.
      
      References:
        OOM killer unexpectedly called with kernel 2.6.32
        http://bugzilla.kernel.org/show_bug.cgi?id=14933
      
      v2: Pass gfp into page mapping.
      v3: Use new read_cache_page_gfp() instead of open-coding.
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
      Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
      Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
      Cc: Eric Anholt <eric@anholt.net>
      Cc: stable@kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4bdadb97
    • L
      mm: add new 'read_cache_page_gfp()' helper function · 0531b2aa
      Linus Torvalds 提交于
      It's a simplified 'read_cache_page()' which takes a page allocation
      flag, so that different paths can control how aggressive the memory
      allocations are that populate a address space.
      
      In particular, the intel GPU object mapping code wants to be able to do
      a certain amount of own internal memory management by automatically
      shrinking the address space when memory starts getting tight.  This
      allows it to dynamically use different memory allocation policies on a
      per-allocation basis, rather than depend on the (static) address space
      gfp policy.
      
      The actual new function is a one-liner, but re-organizing the helper
      functions to the point where you can do this with a single line of code
      is what most of the patch is all about.
      Tested-by: NChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0531b2aa
  3. 27 1月, 2010 10 次提交
  4. 26 1月, 2010 18 次提交
  5. 25 1月, 2010 6 次提交