diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:44 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:44 +0000 |
| commit | 5b5ad5ba01cebe6a749bcf5c9fc9637876fe0b1f (patch) | |
| tree | 8b031a68c4ff6c7457830843adc41d49f0ab2d5f /target/linux/mvebu/patches-3.10/0169-clocksource-armada-370-xp-Replace-WARN_ON-with-BUG_O.patch | |
| parent | 608ad4b6932f72995144bc72a31b1e0843a5bb28 (diff) | |
| download | master-187ad058-5b5ad5ba01cebe6a749bcf5c9fc9637876fe0b1f.tar.gz master-187ad058-5b5ad5ba01cebe6a749bcf5c9fc9637876fe0b1f.tar.bz2 master-187ad058-5b5ad5ba01cebe6a749bcf5c9fc9637876fe0b1f.zip | |
mvebu: backport mainline patches from kernel 3.13
This is a backport of the patches accepted to the Linux mainline related to
mvebu SoC (Armada XP and Armada 370) between Linux v3.12, and Linux v3.13.
This work mainly covers:
* Finishes work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c)
between the PXA family, and the Armada family.
* timer initialization update, and access function for the Armada family.
* Generic IRQ handling backporting.
* Some bug fixes.
Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com>
CC: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39566 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0169-clocksource-armada-370-xp-Replace-WARN_ON-with-BUG_O.patch')
| -rw-r--r-- | target/linux/mvebu/patches-3.10/0169-clocksource-armada-370-xp-Replace-WARN_ON-with-BUG_O.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0169-clocksource-armada-370-xp-Replace-WARN_ON-with-BUG_O.patch b/target/linux/mvebu/patches-3.10/0169-clocksource-armada-370-xp-Replace-WARN_ON-with-BUG_O.patch new file mode 100644 index 0000000000..e170760303 --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0169-clocksource-armada-370-xp-Replace-WARN_ON-with-BUG_O.patch @@ -0,0 +1,29 @@ +From bcaac3d9265d751f7d20df6ed0ac24241308dff7 Mon Sep 17 00:00:00 2001 +From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Date: Tue, 20 Aug 2013 12:45:52 -0300 +Subject: [PATCH 169/203] clocksource: armada-370-xp: Replace WARN_ON with + BUG_ON + +If the clock fails to be obtained and the timer fails to be properly +registered, the kernel will freeze real soon. Instead, let's BUG() +where the actual problem is located. + +Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> +Acked-by: Jason Cooper <jason@lakedaemon.net> +Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> +--- + drivers/clocksource/time-armada-370-xp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/clocksource/time-armada-370-xp.c ++++ b/drivers/clocksource/time-armada-370-xp.c +@@ -306,7 +306,7 @@ static void __init armada_370_timer_init + { + struct clk *clk = of_clk_get(np, 0); + +- WARN_ON(IS_ERR(clk)); ++ BUG_ON(IS_ERR(clk)); + timer_clk = clk_get_rate(clk) / TIMER_DIVIDER; + timer25Mhz = false; + |