diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-28 11:54:33 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-28 11:55:23 +0100 |
| commit | fb5d932ac249a9482672b5e783fc1a91fac4a455 (patch) | |
| tree | d6ba3c39421f728414bd7f1e1bae4b2f9d69e736 /arch/arm/Kconfig.debug | |
| parent | cba26c5ab991768cb7c2d6e96952f1226818fb41 (diff) | |
| parent | 2f3edfd7e27ad4206acbc2ae99c9df5f46353024 (diff) | |
| download | talos-obmc-linux-fb5d932ac249a9482672b5e783fc1a91fac4a455.tar.gz talos-obmc-linux-fb5d932ac249a9482672b5e783fc1a91fac4a455.zip | |
Merge tag 'imx-fixes-3.9-4' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
From Shawn Guo <shawn.guo@linaro.org>:
The imx fixes for 3.9, take 4:
Running suspend/resume without no_console_suspend setting on kernel
cmdline will likely makes system hang. It causesd by the sync issue
between imx_cpu_die() and imx_cpu_kill() call. Fix the issue by
synchronizing the calls using cpu jumping argument register which is
free to use in kernel.
* tag 'imx-fixes-3.9-4' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: imx: fix sync issue between imx_cpu_die and imx_cpu_kill
ARM: imx: add dependency check for DEBUG_IMX_UART_PORT
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig.debug')
| -rw-r--r-- | arch/arm/Kconfig.debug | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index ecfcdba2d17c..9b31f4311ea2 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -495,6 +495,7 @@ config DEBUG_IMX_UART_PORT DEBUG_IMX53_UART || \ DEBUG_IMX6Q_UART default 1 + depends on ARCH_MXC help Choose UART port on which kernel low-level debug messages should be output. |
