aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-05-09 18:13:37 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-05-09 18:13:37 +0000
commit5eae0a2d3d2aaab98b2ae406300827f88a20e3b9 (patch)
tree6fbcdccccc447d454f7a0730aff9de23d1dca94e /target/linux
parent6828466d4f43587f8277680bc3e11114145e613c (diff)
downloadupstream-5eae0a2d3d2aaab98b2ae406300827f88a20e3b9.tar.gz
upstream-5eae0a2d3d2aaab98b2ae406300827f88a20e3b9.tar.bz2
upstream-5eae0a2d3d2aaab98b2ae406300827f88a20e3b9.zip
[ar7] rework 130-clocks_devices_init.patch to make it more robust
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21409 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ar7/patches-2.6.32/130-clocks_devices_init.patch35
1 files changed, 8 insertions, 27 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
index 3175068f50..45f2e453e3 100644
--- 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
@@ -1,27 +1,8 @@
-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
+--- a/arch/mips/ar7/platform.c
++++ b/arch/mips/ar7/platform.c
+@@ -606,4 +606,4 @@ static int __init ar7_register_devices(v
+
+ return res;
+ }
+-arch_initcall(ar7_register_devices);
++device_initcall(ar7_register_devices);