1. 02 Aug, 2011 3 commits
    • David Engraf's avatar
      watchdog: shwdt: fix usage of mod_timer · bea19066
      David Engraf authored
      Fix the usage of mod_timer() and make the driver usable. mod_timer() must
      be called with an absolute timeout in jiffies. The old implementation
      used a relative timeout thus the hardware watchdog was never triggered.
      Signed-off-by: default avatarDavid Engraf <david.engraf@sysgo.com>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      Signed-off-by: default avatarWim Van sebroeck <wim@iguana.be>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Cc: stable <stable@kernel.org>
      bea19066
    • Oleg Nesterov's avatar
      oom: task->mm == NULL doesn't mean the memory was freed · c027a474
      Oleg Nesterov authored
      exit_mm() sets ->mm == NULL then it does mmput()->exit_mmap() which
      frees the memory.
      
      However select_bad_process() checks ->mm != NULL before TIF_MEMDIE,
      so it continues to kill other tasks even if we have the oom-killed
      task freeing its memory.
      
      Change select_bad_process() to check ->mm after TIF_MEMDIE, but skip
      the tasks which have already passed exit_notify() to ensure a zombie
      with TIF_MEMDIE set can't block oom-killer. Alternatively we could
      probably clear TIF_MEMDIE after exit_mmap().
      Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
      Reviewed-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c027a474
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 · cfe22345
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (23 commits)
        regulator: Improve WM831x DVS VSEL selection algorithm
        regulator: Bootstrap wm831x DVS VSEL value from ON VSEL if not already set
        regulator: Set up GPIO for WM831x VSEL before enabling VSEL mode
        regulator: Add EPEs to the MODULE_ALIAS() for wm831x-dcdc
        regulator: Fix WM831x DCDC DVS VSEL bootstrapping
        regulator: Fix WM831x regulator ID lookups for multiple WM831xs
        regulator: Fix argument format type errors in error prints
        regulator: Fix memory leak in set_machine_constraints() error paths
        regulator: Make core more chatty about some errors
        regulator: tps65910: Fix array access out of bounds bug
        regulator: tps65910: Add missing breaks in switch/case
        regulator: tps65910: Fix a memory leak in tps65910_probe error path
        regulator: TWL: Remove entry of RES_ID for 6030 macros
        ASoC: tlv320aic3x: Add correct hw registers to Line1 cross connect muxes
        regulator: Add basic per consumer debugfs
        regulator: Add rdev_crit() macro
        regulator: Refactor supply implementation to work as regular consumers
        regulator: Include the device name in the microamps_requested_ file
        regulator: Increase the limit on sysfs file names
        regulator: Properly register dummy regulator driver
        ...
      cfe22345
  2. 01 Aug, 2011 37 commits