1. 12 9月, 2014 6 次提交
    • L
      Merge tag 'stable/for-linus-3.17-b-rc4-tag' of... · 7ee2d2d6
      Linus Torvalds 提交于
      Merge tag 'stable/for-linus-3.17-b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
      
      Pull Xen bug fixes from David Vrabel:
       - fix for PVHVM suspend/resume and migration
       - don't pointlessly retry certain ballooning ops
       - fix gntalloc when grefs have run out.
       - fix PV boot if KSALR is enable or very large modules are used.
      
      * tag 'stable/for-linus-3.17-b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        x86/xen: don't copy bogus duplicate entries into kernel page tables
        xen/gntalloc: safely delete grefs in add_grefs() undo path
        xen/gntalloc: fix oops after runnning out of grant refs
        xen/balloon: cancel ballooning if adding new memory failed
        xen/manage: Always freeze/thaw processes when suspend/resuming
      7ee2d2d6
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · 018cace2
      Linus Torvalds 提交于
      Pull powerpc fixes from Michael Ellerman:
       "Ben's travelling so this is my first attempt at a pull request.
      
        There's nothing too exciting.  The CONFIG_FHANDLE one is annoying, I
        know you love defconfig changes.  But we've had a couple of developers
        waste time debugging boxes that wouldn't boot, only to realise it's
        just that systemd needs CONFIG_FHANDLE and our defconfigs don't have
        it.
      
        The new syscalls seem to be working, I've run the selftests that
        exist, and also let trinity bash on them for a while"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
        powerpc: Wire up sys_seccomp(), sys_getrandom() and sys_memfd_create()
        powerpc: Make CONFIG_FHANDLE=y for all 64 bit powerpc defconfigs
        powerpc: use machine_subsys_initcall() for opal_hmi_handler_init()
        powerpc/perf: Fix ABIv2 kernel backtraces
        powerpc/pseries: Fix endian issues in memory hotplug
      018cace2
    • L
      Merge tag 'pm+acpi-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 8381e57a
      Linus Torvalds 提交于
      Pull ACPI and power management fixes from Rafael Wysocki:
       "These are regression fixes (cpufreq, ACPI battery) and fixes for stuff
        that never worked correctly (ACPI RTC operation region handler and PM
        domain implementation in the ACPI LPSS driver).
      
        Specifics:
      
         - Fix for the cpufreq Operation Performance Points (OPP) code where a
           recent commit added a kcalloc() call with an incorrect ordering of
           arguments.  From Anand Moon.
      
         - Reverts of two ACPI battery commits that caused incorrect
           diagnostic information to be printed to dmesg in some cases from
           Bjørn Mork.
      
         - Fix for the ACPI RTC operation region handler that applied the &
           operator to an argument already representing an address and that
           caused it to overwrite its own argument instead of writing to the
           address contained in it as expected.  From Chun-Yi Lee.
      
         - Fix for the PM domain implementation in the ACPI LPSS (Low-Power
           Subsystem) driver where one callback pointer pointed to a wrong
           routine and one was NULL, but it shouldn't.  From Fu Zhonghui"
      
      * tag 'pm+acpi-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / LPSS: complete PM entries for LPSS power domain
        Revert "ACPI / battery: fix wrong value of capacity_now reported when fully charged"
        Revert "ACPI / battery: Fix warning message in acpi_battery_get_state()"
        ACPI / RTC: Fix CMOS RTC opregion handler accesses to wrong addresses
        cpufreq / OPP: Fix the order of arguments for kcalloc()
      8381e57a
    • L
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · 1497e84a
      Linus Torvalds 提交于
      Pull dmaengine fixes from Vinod Koul:
       "Two minor fixes.
      
        First one from Kuninori clarifying dmas bindings and second from Lars
        for fixing dma descriptor completion in non cyclic case"
      
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: jz4740: Fix non-cyclic descriptor completion
        dt/bindings: rcar-audmapp: tidyup dmas explanation
      1497e84a
    • L
      Merge tag 'pinctrl-v3.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 8b02c5ef
      Linus Torvalds 提交于
      Pull two pin control fixes from Linus Walleij:
       - fix a warning about unbalanced IRQs on the Baytrail
       - update Tomasz Figa's address in MAINTAINERS
      
      * tag 'pinctrl-v3.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        MAINTAINERS: Tomasz has moved
        pinctrl: baytrail: resolve unbalanced IRQ wake disable warning
      8b02c5ef
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · c8c16e36
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
       "An update to Synaptics PS/2 driver to handle "ForcePads" (currently
        found in HP EliteBook 1040 laptops), a change for Elan PS/2 driver to
        detect newer touchpads, bunch of devices get annotated as Trackpoint
        and/or Pointer to help userspace classify and handle them, plus
        assorted driver fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: serport - add compat handling for SPIOCSTYPE ioctl
        Input: atmel_mxt_ts - fix double free of input device
        Input: synaptics - add support for ForcePads
        Input: matrix_keypad - use request_any_context_irq()
        Input: atmel_mxt_ts - downgrade warning about empty interrupts
        Input: wm971x - fix typo in module parameter description
        Input: cap1106 - fix register definition
        Input: add missing POINTER / DIRECT properties to a bunch of drivers
        Input: add INPUT_PROP_POINTING_STICK property
        Input: elantech - fix detection of touchpad on ASUS s301l
      c8c16e36
  2. 11 9月, 2014 17 次提交
  3. 10 9月, 2014 9 次提交
  4. 09 9月, 2014 8 次提交
    • F
      ACPI / LPSS: complete PM entries for LPSS power domain · f4168b61
      Fu Zhonghui 提交于
      PM entries of LPSS power domain were not implemented correctly
      in commit c78b0830 "ACPI / LPSS: custom power domain for LPSS".
      
      This patch fixes and completes these PM entries.
      
      Fixes: c78b0830 (ACPI / LPSS: custom power domain for LPSS)
      Signed-off-by: NLi Aubrey <aubrey.li@linux.intel.com>
      Signed-off-by: NMika Westerberg <mika.westerberg@linux.intel.com>
      Signed-off-by: NFu Zhonghui <zhonghui.fu@linux.intel.com>
      Cc: 3.16+ <stable@vger.kernel.org> # 3.16+
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      f4168b61
    • B
      Revert "ACPI / battery: fix wrong value of capacity_now reported when fully charged" · 508b3c67
      Bjørn Mork 提交于
      This reverts commit 232de514 ("ACPI / battery: fix wrong value of
      capacity_now reported when fully charged")
      
      There is nothing wrong or unexpected about 'capacity_now' increasing above
      the last 'full_charge_capacity' value. Different charging cycles will cause
      'full_charge_capacity' to vary, both up and down.  Good battery firmwares
      will update 'full_charge_capacity' when the current charging cycle is
      complete, increasing it if necessary. It might even go above
      'design_capacity' on a fresh and healthy battery.
      
      Capping 'capacity_now' to 'full_charge_capacity' is plain wrong, and
      printing a warning if this doesn't happen to match the 'design_capacity'
      is both annoying and terribly wrong.
      
      This results in bogus warnings on perfectly working systems/firmwares:
      
       [Firmware Bug]: battery: reported current charge level (39800) is higher than reported maximum charge level (39800).
      
      and wrong values being reported for 'capacity_now' and
      'full_charge_capacity' after the warning has been triggered.
      
      Fixes: 232de514 ("ACPI / battery: fix wrong value of capacity_now reported when fully charged")
      Cc: 3.16+ <stable@vger.kernel.org> # 3.16+
      Signed-off-by: NBjørn Mork <bjorn@mork.no>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      508b3c67
    • B
      Revert "ACPI / battery: Fix warning message in acpi_battery_get_state()" · 583ee394
      Bjørn Mork 提交于
      This reverts commit d719870b ("ACPI / battery: Fix warning message in
      acpi_battery_get_state()")
      
      Capping 'capacity_now' to 'full_charge_capacity' is plain wrong. If this
      is necessary to work around some buggy firmware, then the workaround needs
      protection against being applied to working firmwares.
      
      Good battery firmwares will allow 'capacity_now' to increase above
      'full_charge_capacity', and will update the latter when the battery
      is fully charged.  By capping 'capacity_now' we lose accurate capacity
      reporting until charging is complete whenever 'full_charge_capacity'
      needs to be increased.
      
      Fixes: d719870b ("ACPI / battery: Fix warning message in acpi_battery_get_state()")
      Cc: 3.16+ <stable@vger.kernel.org> # 3.16+
      Signed-off-by: NBjørn Mork <bjorn@mork.no>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      583ee394
    • M
      microblaze: Fix number of syscalls · 9fc4b7e2
      Michal Simek 提交于
      Number of syscalls have to be updated too.
      Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
      9fc4b7e2
    • M
      microblaze: Rename Advance setup to Kernel features · b408e2c2
      Michal Simek 提交于
      "Advance setup: menu is misleading that's why rename it.
      Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
      b408e2c2
    • M
      microblaze: Add mm/Kconfig to advance menu · 7acdc1cf
      Michal Simek 提交于
      mm/Kconfig is getting too big to be in root menu.
      Move it to submenu.
      Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
      7acdc1cf
    • C
      arch/microblaze/include/asm/uaccess.h: Use pr_devel() instead of pr_debug() · de295cf0
      Chen Gang 提交于
      When DYNAMIC_DEBUG enabled, pr_debug() depends on KBUILD_MODNAME which
      also depends on the modules number in Makefile. The related information
      in "scripts/Makefile.lib" line 94:
      
        # $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will
        # end up in (or would, if it gets compiled in)
        # Note: Files that end up in two or more modules are compiled without the
        #       KBUILD_MODNAME definition. The reason is that any made-up name would
        #       differ in different configs.
      
      For this case, 'radio-si470x-i2c.o' and 'radio-si470x-common.o' are in
      one line, so cause compiling issue. And 'uaccess.h' is a common shared
      header (not specially for drivers), so use pr_devel() instead of is OK.
      
      The related error with allmodconfig:
      
          CC [M]  drivers/media/radio/si470x/radio-si470x-i2c.o
          CC [M]  drivers/media/radio/si470x/radio-si470x-common.o
        In file included from include/linux/printk.h:257:0,
                         from include/linux/kernel.h:13,
                         from drivers/media/radio/si470x/radio-si470x.h:29,
                         from drivers/media/radio/si470x/radio-si470x-common.c:115:
        ./arch/microblaze/include/asm/uaccess.h: In function 'access_ok':
        include/linux/dynamic_debug.h:66:14: error: 'KBUILD_MODNAME' undeclared (first use in this function)
           .modname = KBUILD_MODNAME,   \
                      ^
        include/linux/dynamic_debug.h:76:2: note: in expansion of macro 'DEFINE_DYNAMIC_DEBUG_METADATA'
          DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);  \
          ^
        include/linux/printk.h:263:2: note: in expansion of macro 'dynamic_pr_debug'
          dynamic_pr_debug(fmt, ##__VA_ARGS__)
          ^
        ./arch/microblaze/include/asm/uaccess.h:101:3: note: in expansion of macro 'pr_debug'
           pr_debug("ACCESS fail: %s at 0x%08x (size 0x%x), seg 0x%08x\n",
           ^
      Signed-off-by: NChen Gang <gang.chen.5i5j@gmail.com>
      Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
      de295cf0
    • C
      arch/microblaze/include/asm/entry.h: Include "linux/linkage.h" to avoid compiling issue · dd035246
      Chen Gang 提交于
      "entry.h" needs 'asmlinkage', and "asm/linkage.h" does not provide it.
      So need include "linux/linkage.h" to use generic one instead of.
      
      The related error (with allmodconfig under microblaze):
      
          CC [M]  drivers/net/ethernet/emulex/benet/be_main.o
        In file included from ./arch/microblaze/include/asm/processor.h:17:0,
                         from include/linux/prefetch.h:14,
                         from drivers/net/ethernet/emulex/benet/be_main.c:18:
        ./arch/microblaze/include/asm/entry.h:33:19: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
         extern asmlinkage void do_notify_resume(struct pt_regs *regs, int in_syscall);
                           ^
      Signed-off-by: NChen Gang <gang.chen.5i5j@gmail.com>
      Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
      dd035246