Skip to content

Commit c2becaf

Browse files
robnlundman
authored andcommitted
config: remove HAVE_KMEM_CACHE_CREATE_USERCOPY
Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Tony Hutter <hutter2@llnl.gov> Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de> Signed-off-by: Rob Norris <robn@despairlabs.com> Closes openzfs#16479
1 parent 889a722 commit c2becaf

File tree

3 files changed

+0
-60
lines changed

3 files changed

+0
-60
lines changed

config/kernel-kmem-cache.m4

Lines changed: 0 additions & 41 deletions
This file was deleted.

config/kernel.m4

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
4545
ZFS_AC_KERNEL_SRC_GENERIC_FADVISE
4646
ZFS_AC_KERNEL_SRC_SCHED
4747
ZFS_AC_KERNEL_SRC_USLEEP_RANGE
48-
ZFS_AC_KERNEL_SRC_KMEM_CACHE
4948
ZFS_AC_KERNEL_SRC_KVMALLOC
5049
ZFS_AC_KERNEL_SRC_VMALLOC_PAGE_KERNEL
5150
ZFS_AC_KERNEL_SRC_WAIT
@@ -164,7 +163,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
164163
ZFS_AC_KERNEL_GENERIC_FADVISE
165164
ZFS_AC_KERNEL_SCHED
166165
ZFS_AC_KERNEL_USLEEP_RANGE
167-
ZFS_AC_KERNEL_KMEM_CACHE
168166
ZFS_AC_KERNEL_KVMALLOC
169167
ZFS_AC_KERNEL_VMALLOC_PAGE_KERNEL
170168
ZFS_AC_KERNEL_WAIT

module/os/linux/spl/spl-kmem-cache.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -786,25 +786,8 @@ spl_kmem_cache_create(const char *name, size_t size, size_t align,
786786
if (skc->skc_flags & KMC_RECLAIMABLE)
787787
slabflags |= SLAB_RECLAIM_ACCOUNT;
788788

789-
#if defined(SLAB_USERCOPY)
790-
/*
791-
* Required for PAX-enabled kernels if the slab is to be
792-
* used for copying between user and kernel space.
793-
*/
794-
slabflags |= SLAB_USERCOPY;
795-
#endif
796-
797-
#if defined(HAVE_KMEM_CACHE_CREATE_USERCOPY)
798-
/*
799-
* Newer grsec patchset uses kmem_cache_create_usercopy()
800-
* instead of SLAB_USERCOPY flag
801-
*/
802789
skc->skc_linux_cache = kmem_cache_create_usercopy(
803790
skc->skc_name, size, align, slabflags, 0, size, NULL);
804-
#else
805-
skc->skc_linux_cache = kmem_cache_create(
806-
skc->skc_name, size, align, slabflags, NULL);
807-
#endif
808791
if (skc->skc_linux_cache == NULL)
809792
goto out;
810793
}

0 commit comments

Comments
 (0)