This patch do not apply to source code in v4.18-rc1 due to
commit ce91f6ee5b3b (mm: kvmalloc does not fallback to vmalloc for
incompatible gfp flags) so updating it.
Signed-off-by: Winnie Chang <winnie.chang@xxxxxxxxxxx>
---
patches/lib-bucket_locks.patch | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/patches/lib-bucket_locks.patch b/patches/lib-bucket_locks.patch
index 15eeda1..7a97ce3 100644
--- a/patches/lib-bucket_locks.patch
+++ b/patches/lib-bucket_locks.patch
@@ -1,8 +1,6 @@
-diff --git a/compat/lib-bucket_locks.c b/compat/lib-bucket_locks.c
-index 266a97c5708b..405b52ca5708 100644
--- a/compat/lib-bucket_locks.c
+++ b/compat/lib-bucket_locks.c
-@@ -30,10 +30,24 @@ int alloc_bucket_spinlocks(spinlock_t **
+@@ -31,7 +31,26 @@
}
if (sizeof(spinlock_t) != 0) {
@@ -18,12 +16,14 @@ index 266a97c5708b..405b52ca5708 100644
+ if (!tlocks)
+ tlocks = kmalloc_array(size, sizeof(spinlock_t),
+ gfp);
++#elif LINUX_VERSION_IS_LESS(4,18,0)
++ if (gfpflags_allow_blocking(gfp))
++ tlocks = kvmalloc(size * sizeof(spinlock_t), gfp);
++ else
++ tlocks = kmalloc_array(size, sizeof(spinlock_t), gfp);
+#else
- if (gfpflags_allow_blocking(gfp))
- tlocks = kvmalloc(size * sizeof(spinlock_t), gfp);
- else
- tlocks = kmalloc_array(size, sizeof(spinlock_t), gfp);
+ tlocks = kvmalloc_array(size, sizeof(spinlock_t), gfp);
+#endif
if (!tlocks)
return -ENOMEM;
- for (i = 0; i < size; i++)
+ for (i = 0; i < size; i++) {
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
