1. 10 10月, 2013 1 次提交
    • S
      arch_timer: Move to generic sched_clock framework · 65cd4f6c
      Stephen Boyd 提交于
      Register with the generic sched_clock framework now that it
      supports 64 bits. This fixes two problems with the current
      sched_clock support for machines using the architected timers.
      First off, we don't subtract the start value from subsequent
      sched_clock calls so we can potentially start off with
      sched_clock returning gigantic numbers. Second, there is no
      support for suspend/resume handling so problems such as discussed
      in 6a4dae5e (ARM: 7565/1: sched: stop sched_clock() during
      suspend, 2012-10-23) can happen without this patch. Finally, it
      allows us to move the sched_clock setup into drivers clocksource
      out of the arch ports.
      
      Cc: Christopher Covington <cov@codeaurora.org>
      Cc: Catalin Marinas <catalin.marinas@arm.com>
      Acked-by: NWill Deacon <will.deacon@arm.com>
      Signed-off-by: NStephen Boyd <sboyd@codeaurora.org>
      Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
      65cd4f6c
  2. 19 9月, 2013 1 次提交
    • J
      rtc: rtc-pl031: Set wakeup flag prior to registering rtcdev · 07783397
      John Stultz 提交于
      In some recent testing, I noticed the CLOCK_REALTIME_ALARM clockid
      wasn't functioning on my vexpress qemu environment. Looking into it
      I noticed the pl031 rtc driver doesn't set the wakeup flag on the
      device until after registering the device with the RTC subsystem.
      
      This causes the alarmtimer subsystem to not see the pl031 driver
      as a valid backing device, and that resuls in alarm clockids
      getting ENOTSUPP errors.
      
      Thus be sure to set the wakeup flag on the device prior to
      registering the rtcdev so the pl031 rtc driver can be used as
      the backing alarmtimer device.
      
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Cc: "Jon Medhurst (Tixy)" <tixy@linaro.org>
      Cc: linux-arm-kernel@lists.infradead.org
      Acked-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
      07783397
  3. 18 9月, 2013 1 次提交
  4. 17 9月, 2013 7 次提交
  5. 16 9月, 2013 3 次提交
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · d8efd82e
      Linus Torvalds 提交于
      Pull MIPS fixes from Ralf Baechle:
       "These are four patches for three construction sites:
      
         - Fix register decoding for the combination of multi-core processors
           and multi-threading.
      
         - Two more fixes that are part of the ongoing DECstation resurrection
           work.  One of these touches a DECstation-only network driver.
      
         - Finally Markos' trivial build fix for the AP/SP support.
      
        (With this applied now all MIPS defconfigs are building again)"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: kernel: vpe: Make vpe_attrs an array of pointers.
        MIPS: Fix SMP core calculations when using MT support.
        MIPS: DECstation I/O ASIC DMA interrupt handling fix
        MIPS: DECstation HRT initialization rearrangement
      d8efd82e
    • L
      Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 · cd619e21
      Linus Torvalds 提交于
      Pull x86 platform updates from Matthew Garrett:
       "Nothing amazing here, almost entirely cleanups and minor bugfixes and
        one bit of hardware enablement in the amilo-rfkill driver"
      
      * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
        platform/x86: panasonic-laptop: reuse module_acpi_driver
        samsung-laptop: fix config build error
        platform: x86: remove unnecessary platform_set_drvdata()
        amilo-rfkill: Enable using amilo-rfkill with the FSC Amilo L1310.
        wmi: parse_wdg() should return kernel error codes
        hp_wmi: Fix unregister order in hp_wmi_rfkill_setup()
        platform: replace strict_strto*() with kstrto*()
        x86: irst: use module_acpi_driver to simplify the code
        x86: smartconnect: use module_acpi_driver to simplify the code
        platform samsung-q10: use ACPI instead of direct EC calls
        thinkpad_acpi: add the ability setting TPACPI_LED_NONE by quirk
        thinkpad_acpi: return -NODEV while operating uninitialized LEDs
      cd619e21
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 0375ec58
      Linus Torvalds 提交于
      Pull misc SCSI driver updates from James Bottomley:
       "This patch set is a set of driver updates (megaraid_sas, fnic, lpfc,
        ufs, hpsa) we also have a couple of bug fixes (sd out of bounds and
        ibmvfc error handling) and the first round of esas2r checker fixes and
        finally the much anticipated big endian additions for megaraid_sas"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (47 commits)
        [SCSI] fnic: fnic Driver Tuneables Exposed through CLI
        [SCSI] fnic: Kernel panic while running sh/nosh with max lun cfg
        [SCSI] fnic: Hitting BUG_ON(io_req->abts_done) in fnic_rport_exch_reset
        [SCSI] fnic: Remove QUEUE_FULL handling code
        [SCSI] fnic: On system with >1.1TB RAM, VIC fails multipath after boot up
        [SCSI] fnic: FC stat param seconds_since_last_reset not getting updated
        [SCSI] sd: Fix potential out-of-bounds access
        [SCSI] lpfc 8.3.42: Update lpfc version to driver version 8.3.42
        [SCSI] lpfc 8.3.42: Fixed issue of task management commands having a fixed timeout
        [SCSI] lpfc 8.3.42: Fixed inconsistent spin lock usage.
        [SCSI] lpfc 8.3.42: Fix driver's abort loop functionality to skip IOs already getting aborted
        [SCSI] lpfc 8.3.42: Fixed failure to allocate SCSI buffer on PPC64 platform for SLI4 devices
        [SCSI] lpfc 8.3.42: Fix WARN_ON when driver unloads
        [SCSI] lpfc 8.3.42: Avoided making pci bar ioremap call during dual-chute WQ/RQ pci bar selection
        [SCSI] lpfc 8.3.42: Fixed driver iocbq structure's iocb_flag field running out of space
        [SCSI] lpfc 8.3.42: Fix crash on driver load due to cpu affinity logic
        [SCSI] lpfc 8.3.42: Fixed logging format of setting driver sysfs attributes hard to interpret
        [SCSI] lpfc 8.3.42: Fixed back to back RSCNs discovery failure.
        [SCSI] lpfc 8.3.42: Fixed race condition between BSG I/O dispatch and timeout handling
        [SCSI] lpfc 8.3.42: Fixed function mode field defined too small for not recognizing dual-chute mode
        ...
      0375ec58
  6. 15 9月, 2013 4 次提交
  7. 14 9月, 2013 8 次提交
  8. 13 9月, 2013 15 次提交