aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-05-08 16:58:08 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-05-08 16:58:08 +0000
commit61c07602d5a4064697317fa8fb3c18f8e56acd71 (patch)
treec01588a3db56a8fc9df3b929a9b7ed561a9e9706 /target/linux
parent2c82cf966c8988d2d495ab71fe1e33f9e3da7247 (diff)
downloadupstream-61c07602d5a4064697317fa8fb3c18f8e56acd71.tar.gz
upstream-61c07602d5a4064697317fa8fb3c18f8e56acd71.tar.bz2
upstream-61c07602d5a4064697317fa8fb3c18f8e56acd71.zip
prevent race between clocks and devices registration (#6532)
SVN-Revision: 21404
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ar7/patches-2.6.32/130-clocks_devices_init.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/target/linux/ar7/patches-2.6.32/130-clocks_devices_init.patch b/target/linux/ar7/patches-2.6.32/130-clocks_devices_init.patch
new file mode 100644
index 0000000000..3175068f50
--- /dev/null
+++ b/target/linux/ar7/patches-2.6.32/130-clocks_devices_init.patch
@@ -0,0 +1,27 @@
+commit e09dd7ae2076782c47a8b729b989e20af882415f
+Author: Florian Fainelli <florian@openwrt.org>
+Date: Sat May 8 16:03:34 2010 +0200
+
+ AR7: prevent race between clocks and devices initialization
+
+ ar7_clocks_init and ar7_register_devices are both called at arch_initcall
+ however, ar7_register_devices relies on clocks to be initialized, and clock.o
+ is to be linked later. Fix this by making clock.o be linked earlier.
+
+ Reported-by: Michael J. Evans <mjevans1983@gmail.com>
+ Signed-off-by: Florian Fainelli <florian@openwrt.org>
+
+diff --git a/arch/mips/ar7/Makefile b/arch/mips/ar7/Makefile
+index 26bc5da..2df8910 100644
+--- a/arch/mips/ar7/Makefile
++++ b/arch/mips/ar7/Makefile
+@@ -5,7 +5,7 @@ obj-y := \
+ memory.o \
+ irq.o \
+ time.o \
++ clock.o \
+ platform.o \
+- gpio.o \
+- clock.o
++ gpio.o
+ EXTRA_CFLAGS += -Werror