1. 28 10月, 2013 17 次提交
    • R
      Merge branch 'acpi-assorted' · 5171f4fa
      Rafael J. Wysocki 提交于
      * acpi-assorted:
        ACPI: Add Toshiba NB100 to Vista _OSI blacklist
        ACPI / osl: remove an unneeded NULL check
        ACPI / platform: add ACPI ID for a Broadcom GPS chip
        ACPI: improve acpi_extract_package() utility
        ACPI / LPSS: fix UART Auto Flow Control
        ACPI / platform: Add ACPI IDs for Intel SST audio device
        x86 / ACPI: fix incorrect placement of __initdata tag
        ACPI / thermal: convert printk(LEVEL...) to pr_<lvl>
        ACPI / sysfs: make GPE sysfs attributes only accept correct values
        ACPI / EC: Convert all printk() calls to dynamic debug function
        ACPI / button: Using input_set_capability() to mark device's event capability
        ACPI / osl: implement acpi_os_sleep() with msleep()
      5171f4fa
    • R
      Merge branch 'acpi-video' · 975bcabb
      Rafael J. Wysocki 提交于
      * acpi-video:
        ACPI: Add Toshiba NB100 to Vista _OSI blacklist
        ACPI / video: Ignore BIOS initial backlight value for HP 250 G1
        ACPI / video: Add Lenovo IdeaPad Yoga 13 to acpi video detect blacklist
        thinkpad-acpi: fix handle locate for video and query of _BCL
        ACPI / video: Do not register backlight if win8 and native interface exists
        ACPI / video: seperate backlight control and event interface
        backlight: introduce backlight_device_registered
        ACPI: add missing win8 OSI comment to blacklist
        ACPI: update win8 OSI blacklist
      975bcabb
    • R
      Merge branch 'acpi-pm' · dd6c26be
      Rafael J. Wysocki 提交于
      * acpi-pm:
        spi: attach/detach SPI device to the ACPI power domain
        i2c: attach/detach I2C client device to the ACPI power domain
        ACPI / PM: allow child devices to ignore parent power state
      dd6c26be
    • R
      Merge branch 'acpi-ipmi' · c0ced86d
      Rafael J. Wysocki 提交于
      * acpi-ipmi:
        ACPI / IPMI: Cleanup coding styles
        ACPI / IPMI: Cleanup some Kconfig codes
        ACPI / IPMI: Cleanup some inclusion codes
        ACPI / IPMI: Cleanup some initialization codes
        ACPI / IPMI: Cleanup several acpi_ipmi_device members
        ACPI / IPMI: Add reference counting for ACPI IPMI transfers
        ACPI / IPMI: Use global IPMI operation region handler
        ACPI / IPMI: Fix race caused by the unprotected ACPI IPMI user
        ACPI / IPMI: Fix race caused by the timed out ACPI IPMI transfers
        ACPI / IPMI: Fix race caused by the unprotected ACPI IPMI transfers
        ACPI / IPMI: Fix potential response buffer overflow
      c0ced86d
    • R
      Merge branch 'acpica' · 9183ea62
      Rafael J. Wysocki 提交于
      * acpica:
        MAINTAINERS / ACPICA: Add ACPICA information to MAINTAINERS
        ACPICA: Update version to 20130823.
        ACPICA: SCI Handlers: Update handler interface, eliminate unnecessary argument.
        ACPICA: Cleanup exception codes.
        ACPICA: Tables: Cleanup RSDP signature codes.
        ACPICA: Tables: Cleanup table checksum verification code.
        ACPICA: Debugger: Add new command to display full namespace pathnames.
        ACPICA: Operation region support: Never free the handler "context" pointer.
        ACPICA: Add support for host-installed SCI handlers.
        ACPICA: Validate start object for acpi_walk_namespace.
        ACPICA: Debugger: Prevent possible command line buffer overflow, kernel behavior is not affected.
        ACPICA: Linux-specific header: enable "aarch64" 64-bit build.
        ACPICA: Debug output: small formatting update, no functional change.
        ACPICA: acpi_read: On error, do not modify the return value target location.
        ACPICA: Improve error message for "too many parent prefixes" condition.
      9183ea62
    • R
      Merge branch 'acpi-conversion' · 31c466c1
      Rafael J. Wysocki 提交于
      * acpi-conversion:
        ACPI / AC: Remove AC's proc directory.
        ideapad_laptop: convert ideapad device/driver to platform bus
        ideapad_laptop: remove ideapad_handle and ideapad_priv
        ideapad_laptop: convert internal function calls to use ideapad_private as parameter
        ideapad_laptop: introduce struct acpi_device pointer to ideapad_private structure
        ideapad_laptop: introduce #ifdef CONFIG_PM_SLEEP for PM specific code
        ACPI / AC: convert ACPI ac driver to platform bus
      31c466c1
    • R
      Merge branch 'acpi-tables' · 3f66c315
      Rafael J. Wysocki 提交于
      * acpi-tables:
        ACPI / x86: Increase override tables number limit
      3f66c315
    • R
      Merge branch 'acpi-hotplug' · 5c2aae83
      Rafael J. Wysocki 提交于
      * acpi-hotplug:
        ACPI / memhotplug: Use defined marco METHOD_NAME__STA
        ACPI / hotplug: Use kobject_init_and_add() instead of _init() and _add()
        ACPI / hotplug: Don't set kobject parent pointer explicitly
        ACPI / hotplug: Set kobject name via kobject_add(), not kobject_set_name()
        hotplug, powerpc, x86: Remove cpu_hotplug_driver_lock()
        hotplug / x86: Disable ARCH_CPU_PROBE_RELEASE on x86
        hotplug / x86: Add hotplug lock to missing places
        hotplug / x86: Fix online state in cpu0 debug interface
      5c2aae83
    • R
      Merge branch 'acpi-processor' · 3fbc4d63
      Rafael J. Wysocki 提交于
      * acpi-processor:
        ACPI / processor: fixed a brace coding style issue
        ACPI / processor: Remove outdated comments
        ACPI / processor: remove unnecessary if (!pr) check
        ACPI / processor: remove some dead code in acpi_processor_get_info()
        x86 / ACPI: simplify _acpi_map_lsapic()
        ACPI / processor: use apic_id and remove duplicated _MAT evaluation
        ACPI / processor: Introduce apic_id in struct processor to save parsed APIC id
      3fbc4d63
    • R
      Merge branch 'acpi-cleanup' · 8e32e47d
      Rafael J. Wysocki 提交于
      * acpi-cleanup: (34 commits)
        ACPI / proc: Remove alarm proc file
        ACPI: Remove CONFIG_ACPI_PROCFS_POWER and cm_sbsc.c
        ACPI / SBS: Remove SBS's proc directory
        ACPI / Battery: Remove battery's proc directory
        ACP / fan: trivial style cleanup
        ACPI / processor: remove superfluous pr == NULL checks
        ACPI / mm: use NUMA_NO_NODE
        toshiba_acpi: convert acpi_evaluate_object() to acpi_evaluate_integer()
        intel-smartconnect: convert acpi_evaluate_object() to acpi_evaluate_integer()
        intel-rst: convert acpi_evaluate_object() to acpi_evaluate_integer()
        fujitsu-laptop: convert acpi_evaluate_object() to acpi_evaluate_integer()
        i2c-hid: convert acpi_evaluate_object() to acpi_evaluate_integer()
        ACPI: dock: convert acpi_evaluate_object() to acpi_evaluate_integer()
        acpi_processor: convert acpi_evaluate_object() to acpi_evaluate_integer()
        pnpacpi: convert acpi_get_handle() to acpi_has_method()
        wmi: convert acpi_get_handle() to acpi_has_method()
        toshiba_acpi: convert acpi_get_handle() to acpi_has_method()
        sony-laptop: convert acpi_get_handle() to acpi_has_method()
        intel_menlow: convert acpi_get_handle() to acpi_has_method()
        fujitsu-laptop: convert acpi_get_handle() to acpi_has_method()
        ...
      8e32e47d
    • L
      Linux 3.12-rc7 · 959f5854
      Linus Torvalds 提交于
      959f5854
    • L
      Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · a2ff8206
      Linus Torvalds 提交于
      Pull parisc fix from Helge Deller:
       "This is a 2-line patch to save the CPU register which holds our task
        thread info pointer before calling a firmware function and then to
        restore it again afterwards.
      
        This is necessary because on some 64bit machines the high-order 32bits
        are being clobbered by the firmware call, and thus we failed to bring
        up secondary CPUs (and instead crashed the kernel) in some situations
        eg if we had more than 4GB RAM.  This patch fixes a bug which has been
        since ever in the parisc linux kernel and which prevented some people
        to use a 64bit kernel"
      
      * 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Do not crash 64bit SMP kernels on machines with >= 4GB RAM
      a2ff8206
    • L
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · aff22d3f
      Linus Torvalds 提交于
      Pull timer fix from Ingo Molnar:
       "This tree contains a clockevents regression fix for certain ARM
        subarchitectures"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        clockevents: Sanitize ticks to nsec conversion
      aff22d3f
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e2756f5e
      Linus Torvalds 提交于
      Pull perf fixes from Ingo Molnar:
       "The tree contains three fixes:
      
         - Two tooling fixes
      
         - Reversal of the new 'MMAP2' extended mmap record ABI, introduced in
           this merge window.  (Patches were proposed to fix it but it was all
           a bit late and we felt it's safer to just delay the ABI one more
           kernel release and do it right)"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf: Disable PERF_RECORD_MMAP2 support
        perf scripting perl: Fix build error on Fedora 12
        perf probe: Fix to initialize fname always before use it
      e2756f5e
    • L
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1c99ca43
      Linus Torvalds 提交于
      Pull locking fix from Ingo Molnar:
       "This tree fixes a boot crash in CONFIG_DEBUG_MUTEXES=y kernels, on
        kernels built with GCC 3.x (there are still such distros)"
      
      Side note: it's not just a fix for old gcc versions, it's also removing
      an incredibly broken/subtle check that LLVM had issues with, and that
      made no sense.
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        mutex: Avoid gcc version dependent __builtin_constant_p() usage
      1c99ca43
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · acda24c4
      Linus Torvalds 提交于
      Pull SCSI target fixes from Nicholas Bellinger:
       "Here are the outstanding target pending fixes for v3.12-rc7.
      
        This includes a number of EXTENDED_COPY related fixes as a result of
        Thomas and Doug's continuing testing and feedback.
      
        Also included is an important vhost/scsi fix that addresses a long
        standing issue where the 'write' parameter for get_user_pages_fast()
        was incorrectly set for virtio-scsi WRITEs -> DMA_TO_DEVICE, and not
        for virtio-scsi READs -> DMA_FROM_DEVICE.
      
        This resulted in random userspace segfaults and other unpleasantness
        on KVM host, and unfortunately has been an issue since the initial
        merge of vhost/scsi in v3.6.  This patch is CC'ed to stable, along
        with two other less critical items"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        vhost/scsi: Fix incorrect usage of get_user_pages_fast write parameter
        target/pscsi: fix return value check
        target: Fail XCOPY for non matching source + destination block_size
        target: Generate failure for XCOPY I/O with non-zero scsi_status
        target: Add missing XCOPY I/O operation sense_buffer
        iser-target: check device before dereferencing its variable
        target: Return an error for WRITE SAME with ANCHOR==1
        target: Fix assignment of LUN in tracepoints
        target: Reject EXTENDED_COPY when emulate_3pc is disabled
        target: Allow non zero ListID in EXTENDED_COPY parameter list
        target: Make target_do_xcopy failures return INVALID_PARAMETER_LIST
      acda24c4
    • L
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · 63e65608
      Linus Torvalds 提交于
      Pull slave-dmaengine fixes from Vinod Koul:
       "Here is the late fixes pull request for dmaengine while you fly back
        from KS.
      
        We have a new dmaengine ML hosted by vger so a patch for that along
        with addition of Dave as driver mainatainer for ioat.  Other fixes are
        memeory leak fixes on edma driver, small fixes on rcar-hpbdma driver
        by Sergei"
      
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: edma: fix another memory leak
        dma: edma: Fix memory leak
        MAINTAINERS: add to ioatdma maintainer list
        MAINTAINERS: add the new dmaengine mailing list
      63e65608
  2. 27 10月, 2013 1 次提交
    • H
      parisc: Do not crash 64bit SMP kernels on machines with >= 4GB RAM · 54e181e0
      Helge Deller 提交于
      Since the beginning of the parisc-linux port, sometimes 64bit SMP kernels were
      not able to bring up other CPUs than the monarch CPU and instead crashed the
      kernel.  The reason was unclear, esp. since it involved various machines (e.g.
      J5600, J6750 and SuperDome). Testing showed, that those crashes didn't happened
      when less than 4GB were installed, or if a 32bit Linux kernel was booted.
      
      In the end, the fix for those SMP problems is trivial:
      During the early phase of the initialization of the CPUs, including the monarch
      CPU, the PDC_PSW firmware function to enable WIDE (=64bit) mode is called.
      It's documented that this firmware function may clobber various registers, and
      one one of those possibly clobbered registers is %cr30 which holds the task
      thread info pointer.
      
      Now, if %cr30 would always have been clobbered, then this bug would have been
      detected much earlier. But lots of testing finally showed, that - at least for
      %cr30 - on some machines only the upper 32bits of the 64bit register suddenly
      turned zero after the firmware call.
      
      So, after finding the root cause, the explanation for the various crashes
      became clear:
      - On 32bit SMP Linux kernels all upper 32bit were zero, so we didn't faced this
        problem.
      - Monarch CPUs in 64bit mode always booted sucessfully, because the inital task
        thread info pointer was below 4GB.
      - Secondary CPUs booted sucessfully on machines with less than 4GB RAM because
        the upper 32bit were zero anyay.
      - Secondary CPus failed to boot if we had more than 4GB RAM and the task thread
        info pointer was located above the 4GB boundary.
      
      Finally, the patch to fix this problem is trivial by saving the %cr30 register
      before the firmware call and restoring it afterwards.
      Signed-off-by: NHelge Deller <deller@gmx.de>
      Signed-off-by: NJohn David Anglin <dave.anglin@bell.net>
      Cc: <stable@vger.kernel.org> # 2.6.12+
      Signed-off-by: NHelge Deller <deller@gmx.de>
      54e181e0
  3. 26 10月, 2013 10 次提交
  4. 25 10月, 2013 9 次提交
  5. 24 10月, 2013 3 次提交