1. 08 1月, 2014 5 次提交
  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 次提交
  11. 06 12月, 2013 3 次提交
    • G
      aio: clean up aio ring in the fail path · d1b94327
      Gu Zheng 提交于
      Clean up the aio ring file in the fail path of aio_setup_ring
      and ioctx_alloc. And maybe it can fix the GPF issue reported by
      Dave Jones:
      https://lkml.org/lkml/2013/11/25/898Signed-off-by: NGu Zheng <guz.fnst@cn.fujitsu.com>
      Signed-off-by: NBenjamin LaHaise <bcrl@kvack.org>
      d1b94327
    • J
      Merge branch 'free-memory' of... · bfb26328
      James Morris 提交于
      Merge branch 'free-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
      bfb26328
    • L
      Merge tag 'pm-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 002acf1f
      Linus Torvalds 提交于
      Pull power management fixes from Rafael Wysocki:
      
       - cpufreq regression fix from Bjørn Mork restoring the pre-3.12
         behavior of the framework during system suspend/hibernation to avoid
         garbage sysfs files from being left behind in case of a suspend error
      
       - PNP regression fix to restore the correct states of devices after
         resume from hibernation broken in 3.12.  From Dmitry Torokhov.
      
       - cpuidle fix to prevent cpuidle device unregistration from crashing
         due to a NULL pointer dereference if cpuidle has been disabled from
         the kernel command line.  From Konrad Rzeszutek Wilk.
      
       - intel_idle fix for the C6 state definition on Intel Avoton/Rangeley
         processors from Arne Bockholdt.
      
       - Power capping framework fix to make the energy_uj sysfs attribute
         work in accordance with the documentation.  From Srinivas Pandruvada.
      
       - epoll fix to make it ignore the EPOLLWAKEUP flag if the kernel has
         been compiled with CONFIG_PM_SLEEP unset (in which case that flag
         should not have any effect).  From Amit Pundir.
      
       - cpufreq fix to prevent governor sysfs files from being lost over
         system suspend/resume in some (arguably unusual) situations.  From
         Viresh Kumar.
      
      * tag 'pm-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PowerCap: Fix mode for energy counter
        PNP: fix restoring devices after hibernation
        cpuidle: Check for dev before deregistering it.
        epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled
        cpufreq: fix garbage kobjects on errors during suspend/resume
        cpufreq: suspend governors on system suspend/hibernate
        intel_idle: Fixed C6 state on Avoton/Rangeley processors
      002acf1f
新手
引导
客服 返回
顶部