diff options
| author | Felix Fietkau <nbd@nbd.name> | 2018-09-06 08:57:47 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-09-10 08:54:49 +0200 |
| commit | 7938c1d13b1737a278c8b47ec42c9b1e3ccb8e48 (patch) | |
| tree | fa55d414be32be57bae92038a88ad5d23a338b69 | |
| parent | dafacea0f6aa74998c69f0da7a2d53e56a8c0e1b (diff) | |
patches: remove lib-bucket_locks.patch
Obsoleted by kvmalloc/kvmalloc_array backport
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | patches/lib-bucket_locks.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/patches/lib-bucket_locks.patch b/patches/lib-bucket_locks.patch deleted file mode 100644 index 15eeda11..00000000 --- a/patches/lib-bucket_locks.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 ** - } - - if (sizeof(spinlock_t) != 0) { -+#if LINUX_VERSION_IS_LESS(4,12,0) -+#ifdef CONFIG_NUMA -+ if (size * sizeof(spinlock_t) > PAGE_SIZE && -+ gfp == GFP_KERNEL) -+ tlocks = vmalloc(size * sizeof(spinlock_t)); -+#endif -+ if (gfp != GFP_KERNEL) -+ gfp |= __GFP_NOWARN | __GFP_NORETRY; -+ -+ if (!tlocks) -+ 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); -+#endif - if (!tlocks) - return -ENOMEM; - for (i = 0; i < size; i++) |