From df574a78abbcf7d1129a4ca66f58720abcebe292 Mon Sep 17 00:00:00 2001
From: lr1729 <35510970+lr1729@users.noreply.github.com>
Date: Tue, 8 Dec 2020 02:58:17 -0800
Subject: [PATCH] patch to fix compilation issue on 5.10-rc7 (#135)

---
 PKGBUILD                                           |  4 +++-
 linux-tkg-config/prepare                           |  5 +++++
 linux-tkg-patches/5.10/0013-v5.10-rc7-revert.patch | 11 +++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 linux-tkg-patches/5.10/0013-v5.10-rc7-revert.patch

diff --git a/PKGBUILD b/PKGBUILD
index 4069ba4..1ec9b82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -316,6 +316,7 @@ case $_basever in
         0011-ZFS-fix.patch
         #0012-linux-hardened.patch
         0012-misc-additions.patch
+        0013-v5.10-rc7-revert.patch
     )
     sha256sums=('9f95194fc84eef01789f2ed6566518ef597e9c6541b640f7276f2a3ef1a221f2'
             'SKIP'
@@ -339,7 +340,8 @@ case $_basever in
             'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
             'a5149d7220457d30e03e6999f35a050bce46acafc6230bfe6b4d4994c523516d'
             '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
-            '433b919e6a0be26784fb4304c43b1811a28f12ad3de9e26c0af827f64c0c316e')
+            '433b919e6a0be26784fb4304c43b1811a28f12ad3de9e26c0af827f64c0c316e'
+            '748f7d9db58946d82caf4fe1c76d4f855eee806aa140b0aa69236f1f89a3e5c6')
 	;;
 esac
 
diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index 4bd8334..e4be16e 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -363,6 +363,11 @@ _tkg_srcprep() {
     tkgpatch="$srcdir/0012-misc-additions.patch" && _tkg_patcher
   fi
 
+  if [ "$ver510" = "rc7" ] && [ "$_basever" = "510" ]; then
+    msg2 "Applying 5.10-rc7 compilation patch"
+    tkgpatch="$srcdir/0013-v5.10-rc7-revert.patch" && _tkg_patcher
+  fi
+
   # prjc/bmq patch rev
   if [ "$_basever" = "58" ] || [ "$_basever" = "57" ]; then
     rev=3
diff --git a/linux-tkg-patches/5.10/0013-v5.10-rc7-revert.patch b/linux-tkg-patches/5.10/0013-v5.10-rc7-revert.patch
new file mode 100644
index 0000000..0db3a3c
--- /dev/null
+++ b/linux-tkg-patches/5.10/0013-v5.10-rc7-revert.patch
@@ -0,0 +1,11 @@
+--- a/mm/filemap.c	2020-12-07 01:16:40.233503592 -0800
++++ b/mm/filemap.c	2020-12-07 01:16:05.211387455 -0800
+@@ -827,7 +827,7 @@
+ }
+ EXPORT_SYMBOL_GPL(replace_page_cache_page);
+ 
+-static noinline int __add_to_page_cache_locked(struct page *page,
++noinline int __add_to_page_cache_locked(struct page *page,
+ 					struct address_space *mapping,
+ 					pgoff_t offset, gfp_t gfp,
+ 					void **shadowp)