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

linux510/512/513-tkg: futex2: Use page_to_pgoff instead of hugetlb_basepage_index for more modularity.

Browse Source 
This follows a quick chat with @logos128 : 1137522351 (commitcomment-52947483)
This commit is contained in:
Tk-Glitch
2021-07-04 16:38:20 +02:00
parent cc0a378fe1
commit d0cf5077d2
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PKGBUILD
View File

@@ -338,7 +338,7 @@ case $_basever in
'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320'
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456'
'1e505f3e45aa08ada810ba2d77215d03fc1de0aa6b88c6b3772fce4834961d26'
'f46ed0f026490b11b6a6cfb21e78cd253f0d7c308dc5a34e93971659a4eaa19e'
'c5dd103953b8830640538ba30ff511028bd93310f95e4f5587a6ed5e6414a60d'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
@@ -467,7 +467,7 @@ case $_basever in
'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320'
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456'
'272b8504ac0152b2c72155996408d317fb177b46abbfd6743dfd61554db93e08'
'540dda70cccc0cb23f0d0311f9947209cfe377070620e5fca69f66cc1efe817e'
'f7c68f43599c53ce19a14e6f296e5e0820257e80acb9f52a1dec036d0d9a62ab'
'c6c5bcfac976c2304bdd13b80f8ad0329e5e53a6d9e9d130115204ea09fe2848'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
@@ -520,7 +520,7 @@ case $_basever in
'858ffe05c9f89ad216edacf36c90512f141667a6e13a91b1b6f85ba5b481e129'
'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320'
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
'187ec9590f18a79bc6256e327e836e171c95e55d2afc840edbfad7bece3c97b3'
'9ec679871cba674cf876ba836cde969296ae5034bcc10e1ec39b372e6e07aab0'
'034d12a73b507133da2c69a34d61efd2f6b6618549650aa26d748142d22002e1'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'

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/pagemap.h>
+#include <linux/hugetlb.h>
+#include <linux/jhash.h>
+#include <linux/pagemap.h>
+#include <linux/sched/wake_q.h>
@@ -384,7 +384,7 @@ index 000000000..58cd8a868
+ }
+
+ key->address = get_inode_sequence_number(inode);
+ key->mm = (struct mm_struct *) hugetlb_basepage_index(tail);
+ key->mm = (struct mm_struct *) page_to_pgoff(tail);
+ key->offset |= FUT_OFF_INODE;
+
+ 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/pagemap.h>
+#include <linux/hugetlb.h>
#include <linux/jhash.h>
#include <linux/memblock.h>
+#include <linux/pagemap.h>
@@ -1429,7 +1429,7 @@ index d6a2efbfa488..69866f98f287 100644
+ }
+
+ key->pointer = futex_get_inode_uuid(inode);
+ key->index = (unsigned long)hugetlb_basepage_index(tail);
+ key->index = (unsigned long)page_to_pgoff(tail);
+ key->offset |= FUT_OFF_INODE;
+
+ rcu_read_unlock();

4
linux-tkg-patches/5.13/0007-v5.13-futex2_interface.patch
View File

@@ -1027,7 +1027,7 @@ index ade407c1abb7..51086d0c3fd5 100644
*/
#include <linux/freezer.h>
+#include <linux/pagemap.h>
+#include <linux/hugetlb.h>
#include <linux/jhash.h>
#include <linux/memblock.h>
+#include <linux/pagemap.h>
@@ -1230,7 +1230,7 @@ index ade407c1abb7..51086d0c3fd5 100644
+ }
+
+ key->pointer = futex_get_inode_uuid(inode);
+ key->index = (unsigned long)hugetlb_basepage_index(tail);
+ key->index = (unsigned long)page_to_pgoff(tail);
+ key->offset |= FUT_OFF_INODE;
+
+ rcu_read_unlock();