summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-imx-rt-3.10.31/0001-fix-build.patch
diff options
context:
space:
mode:
authorJacob Kroon <jacob.kroon@mikrodidakt.se>2014-12-21 23:38:11 +0100
committerOtavio Salvador <otavio@ossystems.com.br>2014-12-22 10:13:54 -0200
commit57fd9988d3e96ba3e80c56c4f04ad72746dd1215 (patch)
tree5117c84880284b89b4ced1873d0330d089c809d4 /recipes-kernel/linux/linux-imx-rt-3.10.31/0001-fix-build.patch
parentf69b21d39feca9a4d71d53980fc5c9917ba6c5ac (diff)
downloadmeta-fsl-arm-57fd9988d3e96ba3e80c56c4f04ad72746dd1215.tar.gz
linux-imx-rt: Upgrade to 3.10.31-1.1.0 Beta 2
Rebase onto kernel 3.10.31-1.1.0 Beta 2 from Freescale, plus clock patch from Gary Bisson. Except the kernel update there are no significant changes other than refreshing patches and aligning defconfig. Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel/linux/linux-imx-rt-3.10.31/0001-fix-build.patch')
-rw-r--r--recipes-kernel/linux/linux-imx-rt-3.10.31/0001-fix-build.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-imx-rt-3.10.31/0001-fix-build.patch b/recipes-kernel/linux/linux-imx-rt-3.10.31/0001-fix-build.patch
new file mode 100644
index 0000000..ffc6b74
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-rt-3.10.31/0001-fix-build.patch
@@ -0,0 +1,57 @@
1Fix build errors when RT patch is applied
2
3Upstream-Status: Inappropriate [other]
4Freescale does not support the RT patch
5
6Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
7
8Index: git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
9===================================================================
10--- git.orig/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
11+++ git/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
12@@ -7746,7 +7746,7 @@ gckOS_WaitSignal(
13
14 might_sleep();
15
16- spin_lock_irq(&signal->obj.wait.lock);
17+ raw_spin_lock_irq(&signal->obj.wait.lock);
18
19 if (signal->obj.done)
20 {
21@@ -7768,9 +7768,8 @@ gckOS_WaitSignal(
22 ? MAX_SCHEDULE_TIMEOUT
23 : Wait * HZ / 1000;
24
25- DECLARE_WAITQUEUE(wait, current);
26- wait.flags |= WQ_FLAG_EXCLUSIVE;
27- __add_wait_queue_tail(&signal->obj.wait, &wait);
28+ DEFINE_SWAITER(wait);
29+ swait_prepare_locked(&signal->obj.wait, &wait);
30
31 while (gcvTRUE)
32 {
33@@ -7782,9 +7781,9 @@ gckOS_WaitSignal(
34 }
35
36 __set_current_state(TASK_INTERRUPTIBLE);
37- spin_unlock_irq(&signal->obj.wait.lock);
38+ raw_spin_unlock_irq(&signal->obj.wait.lock);
39 timeout = schedule_timeout(timeout);
40- spin_lock_irq(&signal->obj.wait.lock);
41+ raw_spin_lock_irq(&signal->obj.wait.lock);
42
43 if (signal->obj.done)
44 {
45@@ -7805,10 +7804,10 @@ gckOS_WaitSignal(
46 }
47 }
48
49- __remove_wait_queue(&signal->obj.wait, &wait);
50+ swait_finish_locked(&signal->obj.wait, &wait);
51 }
52
53- spin_unlock_irq(&signal->obj.wait.lock);
54+ raw_spin_unlock_irq(&signal->obj.wait.lock);
55
56 OnError:
57 /* Return status. */