sravan/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux510/512-tkg: Fix futex2 patchsets for https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.12.14&id=11b5f1bdadb6ed6ba8694a94805af248c9170dae changes that got backported from 5.13

Browse Source 
Fixes https://github.com/Frogging-Family/linux-tkg/issues/275
This commit is contained in:
Tk-Glitch
2021-07-01 10:59:29 +02:00
parent 1403e2f117
commit 1137522351
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PKGBUILD
View File

@@ -59,7 +59,7 @@ else
fi fi
pkgname=("${pkgbase}" "${pkgbase}-headers") pkgname=("${pkgbase}" "${pkgbase}-headers")
pkgver="${_basekernel}"."${_sub}" pkgver="${_basekernel}"."${_sub}"
pkgrel=172 pkgrel=173
pkgdesc='Linux-tkg' pkgdesc='Linux-tkg'
arch=('x86_64') # no i686 in here arch=('x86_64') # no i686 in here
url="http://www.kernel.org/" url="http://www.kernel.org/"
@@ -338,7 +338,7 @@ case $_basever in
'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320' 'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320'
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a' '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456' 'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456'
'47c05c6e7e1280dca137ed2139dac7da0d026a27d5590fd386748d1827288a61' '1e505f3e45aa08ada810ba2d77215d03fc1de0aa6b88c6b3772fce4834961d26'
'c5dd103953b8830640538ba30ff511028bd93310f95e4f5587a6ed5e6414a60d' 'c5dd103953b8830640538ba30ff511028bd93310f95e4f5587a6ed5e6414a60d'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
@@ -467,7 +467,7 @@ case $_basever in
'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320' 'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320'
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a' '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456' 'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456'
'fc0a3274e3285278e925f4b3bfe803e5e610344bebe5bba063ba202dbaff49c8' '272b8504ac0152b2c72155996408d317fb177b46abbfd6743dfd61554db93e08'
'f7c68f43599c53ce19a14e6f296e5e0820257e80acb9f52a1dec036d0d9a62ab' 'f7c68f43599c53ce19a14e6f296e5e0820257e80acb9f52a1dec036d0d9a62ab'
'c6c5bcfac976c2304bdd13b80f8ad0329e5e53a6d9e9d130115204ea09fe2848' 'c6c5bcfac976c2304bdd13b80f8ad0329e5e53a6d9e9d130115204ea09fe2848'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'

4
linux-tkg-patches/5.10/0007-v5.10-futex2_interface.patch
View File

@@ -172,7 +172,7 @@ index 000000000..58cd8a868
+ */ + */
+ +
+#include <linux/freezer.h> +#include <linux/freezer.h>
+#include <linux/hugetlb.h> +#include <linux/pagemap.h>
+#include <linux/jhash.h> +#include <linux/jhash.h>
+#include <linux/pagemap.h> +#include <linux/pagemap.h>
+#include <linux/sched/wake_q.h> +#include <linux/sched/wake_q.h>
@@ -384,7 +384,7 @@ index 000000000..58cd8a868
+ } + }
+ +
+ key->address = get_inode_sequence_number(inode); + key->address = get_inode_sequence_number(inode);
+ key->mm = (struct mm_struct *) basepage_index(tail); + key->mm = (struct mm_struct *) hugetlb_basepage_index(tail);
+ key->offset |= FUT_OFF_INODE; + key->offset |= FUT_OFF_INODE;
+ +
+ rcu_read_unlock(); + rcu_read_unlock();

4
linux-tkg-patches/5.12/0007-v5.12-futex2_interface.patch
View File

@@ -1226,7 +1226,7 @@ index d6a2efbfa488..69866f98f287 100644
*/ */
#include <linux/freezer.h> #include <linux/freezer.h>
+#include <linux/hugetlb.h> +#include <linux/pagemap.h>
#include <linux/jhash.h> #include <linux/jhash.h>
#include <linux/memblock.h> #include <linux/memblock.h>
+#include <linux/pagemap.h> +#include <linux/pagemap.h>
@@ -1429,7 +1429,7 @@ index d6a2efbfa488..69866f98f287 100644
+ } + }
+ +
+ key->pointer = futex_get_inode_uuid(inode); + key->pointer = futex_get_inode_uuid(inode);
+ key->index = (unsigned long)basepage_index(tail); + key->index = (unsigned long)hugetlb_basepage_index(tail);
+ key->offset |= FUT_OFF_INODE; + key->offset |= FUT_OFF_INODE;
+ +
+ rcu_read_unlock(); + rcu_read_unlock();