1. 08 2月, 2012 3 次提交
  2. 07 2月, 2012 7 次提交
  3. 06 2月, 2012 2 次提交
  4. 05 2月, 2012 10 次提交
    • G
      hwmon: (w83627ehf) Fix number of fans for NCT6776F · 585c0fd8
      Guenter Roeck 提交于
      NCT6776F can select fan input pins for fans 3 to 5 with a secondary set of
      chip register bits. Check that second set of bits in addition to the first set
      to detect if fans 3..5 are monitored.
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Cc: stable@vger.kernel.org # 3.0+
      Acked-by: NJean Delvare <khali@linux-fr.org>
      585c0fd8
    • L
      Merge tag 'pm-fixes-for-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 23783f81
      Linus Torvalds 提交于
      Power management fixes for 3.3-rc3
      
      Three power management regression fixes, one for a recent regression introcuded
      by the freezer changes during the 3.3 merge window and two for regressions
      in cpuidle (resulting from PM QoS changes) and in the hibernate user space
      interface, both introduced during the 3.2 development cycle.
      
      They include:
      
      * Two hibernate (s2disk) regression fixes from Srivatsa S. Bhat (for
       regressions introduced during the 3.3 merge window and during the 3.2
       development cycle).
      
      * A cpuidle fix from Venki Pallipadi for a regression resulting from PM QoS
       changes during the 3.2 development cycle causing cpuidle to work incorrectly
       for CONFIG_PM unset.
      
      * tag 'pm-fixes-for-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM / QoS: CPU C-state breakage with PM Qos change
        PM / Freezer: Thaw only kernel threads if freezing of kernel threads fails
        PM / Hibernate: Thaw kernel threads in SNAPSHOT_CREATE_IMAGE ioctl path
      23783f81
    • V
      PM / QoS: CPU C-state breakage with PM Qos change · d020283d
      Venkatesh Pallipadi 提交于
      Looks like change "PM QoS: Move and rename the implementation files"
      merged during the 3.2 development cycle made PM QoS depend on
      CONFIG_PM which depends on (PM_SLEEP || PM_RUNTIME).
      
      That breaks CPU C-states with kernels not having these CONFIGs, causing CPUs
      to spend time in Polling loop idle instead of going into deep C-states,
      consuming way way more power. This is with either acpi idle or intel idle
      enabled.
      
      Either CONFIG_PM should be enabled with any pm_qos users or
      the !CONFIG_PM pm_qos_request() should return sane defaults not to break
      the existing users. Here's is the patch for the latter option.
      
      [rjw: Modified the changelog slightly.]
      Signed-off-by: NVenkatesh Pallipadi <venki@google.com>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      Cc: stable@vger.kernel.org
      d020283d
    • S
      PM / Freezer: Thaw only kernel threads if freezing of kernel threads fails · 379e0be8
      Srivatsa S. Bhat 提交于
      If freezing of kernel threads fails, we are expected to automatically
      thaw tasks in the error recovery path. However, at times, we encounter
      situations in which we would like the automatic error recovery path
      to thaw only the kernel threads, because we want to be able to do
      some more cleanup before we thaw userspace. Something like:
      
      error = freeze_kernel_threads();
      if (error) {
      	/* Do some cleanup */
      
      	/* Only then thaw userspace tasks*/
      	thaw_processes();
      }
      
      An example of such a situation is where we freeze/thaw filesystems
      during suspend/hibernation. There, if freezing of kernel threads
      fails, we would like to thaw the frozen filesystems before thawing
      the userspace tasks.
      
      So, modify freeze_kernel_threads() to thaw only kernel threads in
      case of freezing failure. And change suspend_freeze_processes()
      accordingly. (At the same time, let us also get rid of the rather
      cryptic usage of the conditional operator (:?) in that function.)
      
      [rjw: In fact, this patch fixes a regression introduced during the
       3.3 merge window, because without it thaw_processes() may be called
       before swsusp_free() in some situations and that may lead to massive
       memory allocation failures.]
      Signed-off-by: NSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Acked-by: NTejun Heo <tj@kernel.org>
      Acked-by: NNigel Cunningham <nigel@tuxonice.net>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      379e0be8
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d9142025
      Linus Torvalds 提交于
      arm-soc fixes for 3.3-rc
      
      * A series of OMAP regression fixes for merge window fallout
      * Two patches for Davinci, one removes some misdefined clocks, the other
        is a regression fix for merge window fallout
      * Two patches that makes Broadcom bcmring build again (and removes a
        bunch of unused code in the process)
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: bcmring: fix build failure in mach-bcmring/arch.c
        ARM: bcmring: remove unused DMA map code
        ARM: davinci: update mdio bus name
        ARM: OMAP2+: arch/arm/mach-omap2/smartreflex.c: add missing iounmap
        ARM: OMAP2+: arch/arm/mach-omap2/devices.c: introduce missing kfree
        ARM: OMAP: fix MMC2 loopback clock handling
        ARM: OMAP: fix erroneous mmc2 clock change on mmc3 setup
        ARM: OMAP2+: GPMC: fix device size setup
        ARM: OMAP2+: timer: Fix crash due to wrong arg to __omap_dm_timer_read_counter
        ARM: OMAP3: hwmod data: register dss hwmods after dss_core
        ARM: OMAP2/3: PRM: fix missing plat/irqs.h build breakage
        ARM: OMAP2+: io: fix compilation breakage on 2420-only configs
        ARM: OMAP4: hwmod data: Add names for DMIC memory address space
        ARM: OMAP3: hwmod data: add SYSC_HAS_ENAWAKEUP for dispc
        ARM: OMAP2+: hwmod data: split omap2/3 dispc hwmod class
        ARM: davinci: DA850: remove non-existing pll1_sysclk4-7 clocks
        ARM: OMAP2: fix regulator warnings
        ARM: OMAP2: fix omap3 touchbook kconfig warning
        i2c: OMAP: Fix OMAP1 build error
      d9142025
    • P
      ARM: bcmring: fix build failure in mach-bcmring/arch.c · ca43784d
      Paul Gortmaker 提交于
      Upstream commit d1fce9c1
      
         "ARM: restart: bcmring: use new restart hook"
      
      breaks building of this platform, since what used to be the
      last field of the MACHINE_START/END block didn't have a
      trailing comma.  Once another field was added below, we get:
      
      arch/arm/mach-bcmring/arch.c:198: error: request for member 'restart' in something not a structure or union
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      Acked-by: NJiandong Zheng <jdzheng@broadcom.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      ca43784d
    • J
      ARM: bcmring: remove unused DMA map code · 864e5e36
      JD Zheng 提交于
      Remove BCMRING DMA map code which is no longer used.
      
      This also fixes a build error with dma.c introduced by
      bfcd2ea6.
      Signed-off-by: NJiandong Zheng <jdzheng@broadcom.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      864e5e36
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 31c150a1
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: i8042 - add Lenovo Ideapad U455 to 'reset' blacklist
        Input: serio_raw - return proper result when serio_raw_read fails
        Input: document device properties
        Input: twl4030_keypad - fix comment (trivial)
        Input: gpio_keys - fix struct device declared inside parameter list
        Input: evdev - fix variable initialisation
      31c150a1
    • L
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · 4554c135
      Linus Torvalds 提交于
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        i.MX SDMA: Fix burstsize settings
        ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only
        dma: sh_dma: not all SH DMAC implementations support MEMCPY
        at_hdmac: bugfix for enabling channel irq
        dmaengine: fix missing 'cnt' in ?: in dmatest
      4554c135
    • L
      Merge branch 'akpm' · 82bdc843
      Linus Torvalds 提交于
      * akpm:
        mm: compaction: check pfn_valid when entering a new MAX_ORDER_NR_PAGES block during isolation for migration
        readahead: fix pipeline break caused by block plug
        kprobes: fix a memory leak in function pre_handler_kretprobe()
        drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer
        lkdtm: avoid calling lkdtm_do_action() with spinlock held
        mm/filemap_xip.c: fix race condition in xip_file_fault()
        mm/memcontrol.c: fix warning with CONFIG_NUMA=n
        avr32: select generic atomic64_t support
        mm: postpone migrated page mapping reset
        xtensa: fix memscan()
        MAINTAINERS: update lguest F: patterns
        MAINTAINERS: remove staging sections
        MAINTAINERS: remove iMX5 section
        MAINTAINERS: update partitions block F: patterns
      82bdc843
  5. 04 2月, 2012 18 次提交