Strip __GFP_ZERO from kmalloc it is not available for older kernels.

This is needed to avoid a BUG_ON() on RHEL5.4 kernel 2.6.18-164.6.1,
since __GFP_ZERO is not a valid flag for kmalloc().

diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c
index 64498ee5d70e0494dd7c670dc6ed126754f13159..f87d2b55ab46c06f5db084ccb5ef515b47579c99 100644 (file)
--- a/module/spl/spl-kmem.c
+++ b/module/spl/spl-kmem.c
@@ -505,7 +505,8 @@ vmem_alloc_track(size_t size, int flags, const char *func, int line)
 
        ASSERT(flags & KM_SLEEP);
 
-       dptr = (kmem_debug_t *) kmalloc_nofail(sizeof(kmem_debug_t), flags);
+       dptr = (kmem_debug_t *) kmalloc_nofail(sizeof(kmem_debug_t),
+           flags & ~__GFP_ZERO);
        if (dptr == NULL) {
                CWARN("vmem_alloc(%ld, 0x%x) debug failed\n",
                    sizeof(kmem_debug_t), flags);