From: Russell King Date: Mon, 9 Aug 2010 13:07:19 +0000 (+0100) Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux... X-Git-Tag: v2.6.36-rc1~102^2^2^2 X-Git-Url: http://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=2192482ee5ce5d5d4a6cec0c351b2d3a744606eb Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable Conflicts: arch/arm/Kconfig --- 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb diff --cc arch/arm/Kconfig index e39caa8b0c9,c797a8b4d8c..37a36457bb3 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -1171,9 -1198,9 +1196,9 @@@ config LOCAL_TIMER bool "Use local timer interrupts" depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \ REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \ - ARCH_U8500 || ARCH_VEXPRESS_CA9X4) - ARCH_U8500 || ARCH_S5PV310) -- default y - select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || ARCH_U8500) - select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_S5PV310) ++ ARCH_S5PV310 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4) ++ select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 || \ ++ ARCH_U8500 || ARCH_VEXPRESS) help Enable support for local timers on SMP platforms, rather then the legacy IPI broadcast method. Local timers allows the system @@@ -1184,10 -1211,11 +1209,11 @@@ source kernel/Kconfig.preemp config HZ int - default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210 - default 128 if ARCH_L7200 - default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || \ - ARCH_S5PV210 || ARCH_S5PV310 ++ default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || \ ++ ARCH_S5P6442 || ARCH_S5PV210 || ARCH_S5PV310 default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER default AT91_TIMER_HZ if ARCH_AT91 + default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE default 100 config THUMB2_KERNEL