summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2019-07-22 23:44:19 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2019-07-22 23:44:19 -0400
commit0e1982be0f1afc6675f05f676a1599f545dbe4ba (patch)
tree638442ffa0f1cfa445f9502b0f2950a4bdd2566a
parent51d009854d5b983833cf1aa50bac437c58c578b1 (diff)
downloadyocto-kernel-cache-0e1982be0f1afc6675f05f676a1599f545dbe4ba.tar.gz
yocto-kernel-cache-0e1982be0f1afc6675f05f676a1599f545dbe4ba.tar.bz2
yocto-kernel-cache-0e1982be0f1afc6675f05f676a1599f545dbe4ba.zip
aufs5: fix build on v5.3+
1/1 [ Author: Bruce Ashfield Email: bruce.ashfield@gmail.com Subject: aufs5: fix build on v5.3+ Date: Mon, 22 Jul 2019 23:14:41 -0400 commit 9af0f1a46bbb6ad9ee8b35957251f4aa826b023f changes the rw_sem task owner to an atomic type. We switch to using the introduced helper function to get aufs compiling against 5.3 Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--features/aufs/aufs.scc1
-rw-r--r--features/aufs/aufs5-fix-build-on-v5.3.patch30
2 files changed, 31 insertions, 0 deletions
diff --git a/features/aufs/aufs.scc b/features/aufs/aufs.scc
index ca8c8360..762e7cdc 100644
--- a/features/aufs/aufs.scc
+++ b/features/aufs/aufs.scc
@@ -3,3 +3,4 @@ patch aufs5-base-support.patch
patch aufs5-mmap-support.patch
patch aufs5-standalone-support.patch
patch aufs5-core-support.patch
+patch aufs5-fix-build-on-v5.3.patch
diff --git a/features/aufs/aufs5-fix-build-on-v5.3.patch b/features/aufs/aufs5-fix-build-on-v5.3.patch
new file mode 100644
index 00000000..cbcc369e
--- /dev/null
+++ b/features/aufs/aufs5-fix-build-on-v5.3.patch
@@ -0,0 +1,30 @@
+From 73625e20eaf6a41d5c39bc667c67f9e7fdaebdfe Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Mon, 22 Jul 2019 23:14:41 -0400
+Subject: [PATCH] aufs5: fix build on v5.3+
+
+commit 9af0f1a46bbb6ad9ee8b35957251f4aa826b023f changes the rw_sem
+task owner to an atomic type. We switch to using the introduced
+helper function to get aufs compiling against 5.3
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ fs/aufs/i_op.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c
+index 4f5001ebd0f4..3455f2ecb407 100644
+--- a/fs/aufs/i_op.c
++++ b/fs/aufs/i_op.c
+@@ -641,7 +641,7 @@ int au_pin_hdir_relock(struct au_pin *p)
+ static void au_pin_hdir_set_owner(struct au_pin *p, struct task_struct *task)
+ {
+ #if !defined(CONFIG_RWSEM_GENERIC_SPINLOCK) && defined(CONFIG_RWSEM_SPIN_ON_OWNER)
+- p->hdir->hi_inode->i_rwsem.owner = task;
++ atomic_long_set(&p->hdir->hi_inode->i_rwsem.owner, (long)task);
+ #endif
+ }
+
+--
+2.19.1
+