1. 08 1月, 2014 8 次提交
  2. 02 1月, 2014 5 次提交
  3. 24 12月, 2013 1 次提交
  4. 21 12月, 2013 2 次提交
    • L
      ARM: s3c64xx: get rid of custom <mach/gpio.h> · 41c3548e
      Linus Walleij 提交于
      This isolates the custom S3C64xx GPIO definition table to
      <linux/platform_data/gpio-samsung-s3x64xx.h> as this is
      used in a few different places in the kernel, removing the
      need to depend on the implicit inclusion of <mach/gpio.h>
      from <linux/gpio.h> and thus getting rid of a few nasty
      cross-dependencies.
      
      Also delete the CONFIG_SAMSUNG_GPIO_EXTRA stuff. Instead
      roof the number of GPIOs for this platform:
      First sum up all the GPIO banks from A to Q: 187 GPIOs.
      Add the 16 "board GPIOs" and the roof for SAMSUNG_GPIO_EXTRA,
      128, so in total maximum 187+16+128 = 331 GPIOs, so let's
      take the same roof as for S3C24XX: 512. This way we can do
      away with the GPIO calculation macros for GPIO_BOARD_START,
      BOARD_NR_GPIOS and the definition of ARCH_NR_GPIOS.
      
      Cc: Mark Brown <broonie@kernel.org>
      [on Mini6410 board]
      Tested-by: NTomasz Figa <t.figa@samsung.com>
      [for changes in mach-s3c64xx]
      Acked-by: NTomasz Figa <t.figa@samsung.com>
      Tested-by: NMark Brown <broonie@linaro.org>
      Acked-by: NKukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      41c3548e
    • L
      ARM: s3c24xx: get rid of custom <mach/gpio.h> · c67d0f29
      Linus Walleij 提交于
      This isolates the custom S3C24xx GPIO definition table to
      <linux/platform_data/gpio-samsung-s3x24xx.h> as this is
      used in a few different places in the kernel, removing the
      need to depend on the implicit inclusion of <mach/gpio.h>
      from <linux/gpio.h> and thus getting rid of a few nasty
      cross-dependencies.
      
      We also delete the nifty CONFIG_S3C24XX_GPIO_EXTRA stuff.
      The biggest this can ever be for the S3C24XX is
      CONFIG_S3C24XX_GPIO_EXTRA = 128, and then for CPU_S3C2443 or
      CPU_S3C2416 32*12 GPIOs are added, so 32*12+128 = 512
      is the absolute roof value on this platform. So we set
      the size of ARCH_NR_GPIO to this and the GPIOs array will
      fit any S3C24XX platform, as per pattern from other archs.
      
      ChangeLog v2->v3:
      - Move the movement of the S3C64XX gpio.h file out of
        this patch and into the follow-up patch where it belongs.
      ChangeLog v1->v2:
      - Added an #ifdef ARCH_S3C24XX around the header inclusion
        in drivers/gpio/gpio-samsung.c as we would otherwise
        have colliding definitions when compiling S3C64XX.
      - Rename inclusion guard in the header file.
      
      Cc: Tomasz Figa <tomasz.figa@gmail.com>
      Cc: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
      Cc: Ben Dooks <ben-linux@fluff.org>
      Cc: linux-samsung-soc@vger.kernel.org
      Acked-by: NKukjin Kim <kgene.kim@samsung.com>
      Acked-by: NHeiko Stuebner <heiko@sntech.de>
      Tested-by: NHeiko Stuebner <heiko@sntech.de>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      c67d0f29
  5. 20 12月, 2013 4 次提交
  6. 13 12月, 2013 3 次提交
  7. 12 12月, 2013 3 次提交
  8. 11 12月, 2013 2 次提交
  9. 09 12月, 2013 6 次提交
  10. 07 12月, 2013 6 次提交
    • L
      Linux 3.13-rc3 · 374b1057
      Linus Torvalds 提交于
      374b1057
    • L
      Merge tag 'trace-fixes-3.13-rc2' of... · 843f4f4b
      Linus Torvalds 提交于
      Merge tag 'trace-fixes-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull tracing fix from Steven Rostedt:
       "A regression showed up that there's a large delay when enabling all
        events.  This was prevalent when FTRACE_SELFTEST was enabled which
        enables all events several times, and caused the system bootup to
        pause for over a minute.
      
        This was tracked down to an addition of a synchronize_sched()
        performed when system call tracepoints are unregistered.
      
        The synchronize_sched() is needed between the unregistering of the
        system call tracepoint and a deletion of a tracing instance buffer.
        But placing the synchronize_sched() in the unreg of *every* system
        call tracepoint is a bit overboard.  A single synchronize_sched()
        before the deletion of the instance is sufficient"
      
      * tag 'trace-fixes-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Only run synchronize_sched() at instance deletion time
      843f4f4b
    • L
      Merge git://git.kvack.org/~bcrl/aio-next · c537aba0
      Linus Torvalds 提交于
      Pull aio fix from Benjamin LaHaise:
       "AIO fix from Gu Zheng that fixes a GPF that Dave Jones uncovered with
        trinity"
      
      * git://git.kvack.org/~bcrl/aio-next:
        aio: clean up aio ring in the fail path
      c537aba0
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 7adfff58
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "This is a set of nine fixes (and one author update).
      
        The libsas one should fix discovery in eSATA devices, the WRITE_SAME
        one is the largest, but it should fix a lot of problems we've been
        getting with the emulated RAID devices (they've been effectively lying
        about support and then firmware has been choking on the commands).
      
        The rest are various crash, hang or warn driver fixes"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        [SCSI] bfa: Fix crash when symb name set for offline vport
        [SCSI] enclosure: fix WARN_ON in dual path device removing
        [SCSI] pm80xx: Tasklets synchronization fix.
        [SCSI] pm80xx: Resetting the phy state.
        [SCSI] pm80xx: Fix for direct attached device.
        [SCSI] pm80xx: Module author addition
        [SCSI] hpsa: return 0 from driver probe function on success, not 1
        [SCSI] hpsa: do not discard scsi status on aborted commands
        [SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers
        [SCSI] libsas: fix usage of ata_tf_to_fis
      7adfff58
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 470abdcf
      Linus Torvalds 提交于
      Pull IMA fixes from James Morris:
       "Here are two more fixes for IMA"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        ima: properly free ima_template_entry structures
        ima: Do not free 'entry' before it is initialized
      470abdcf
    • L
      Merge tag 'dt-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 24cb4120
      Linus Torvalds 提交于
      Pull devicetree fixes from Rob Herring:
       - Various DT binding documentation updates
       - Add Kumar Gala and remove Stephen Warren as DT binding maintainers
      
      * tag 'dt-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        dt: binding: reword PowerPC 8xxx GPIO documentation
        ARM: tegra: delete nvidia,tegra20-spi.txt binding
        hwmon: ntc_thermistor: Fix typo (pullup-uV -> pullup-uv)
        of: add vendor prefix for GMT
        clk: exynos: Fix typos in DT bindings documentation
        of: Add vendor prefix for LG Corporation
        Documentation: net: fsl-fec.txt: Add phy-supply entry
        ARM: dts: doc: Document missing binding for omap5-mpu
        dt-bindings: add ARMv8 PMU binding
        MAINTAINERS: remove swarren from DT bindings
        MAINTAINERS: Add Kumar to Device Tree Binding maintainers group
      24cb4120