diff options
| author | behlendo <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c> | 2008-08-05 04:16:09 +0000 |
|---|---|---|
| committer | behlendo <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c> | 2008-08-05 04:16:09 +0000 |
| commit | 7afde631f6483cc5e2da95a84a98085e7453cf52 (patch) | |
| tree | ba38368b360a9d39d8c00c4d14bb3981a4efd7ad /include | |
| parent | 73035a29eb2cea265de650e26be3cc5a0e3efcb0 (diff) | |
Start bringing in Ricardo's spl-00-rhel4-compat.patch, a few chunks
at a time as I audit it. This chunk finishes moving the SPL entirely
off the linux slab on to the SPL implementation. It differs slightly
from the proposed version in that the spl continues to export to
all the Solaris types and functions. These do conflict with the
Linux slab so a module usings these interfaces must not include the
SPL slab if they also intend to use the linux slab. Or they must
explcitly #undef the macros which remap the functioin to their
spl_* equivilants.
A nice side of effect of dropping the entire linux slab is we
don't need to autoconf checks anymore. They kept messing with
the slab API endlessly!
git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@148 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c
Diffstat (limited to 'include')
| -rw-r--r-- | include/sys/kmem.h | 1 | ||||
| -rw-r--r-- | include/sys/types.h | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/sys/kmem.h b/include/sys/kmem.h index 9397caa0a..dd1514fb9 100644 --- a/include/sys/kmem.h +++ b/include/sys/kmem.h @@ -529,6 +529,7 @@ typedef struct spl_kmem_cache { uint64_t skc_obj_alloc; /* Obj alloc current */ uint64_t skc_obj_max; /* Obj max historic */ } spl_kmem_cache_t; +#define kmem_cache_t spl_kmem_cache_t extern spl_kmem_cache_t * spl_kmem_cache_create(char *name, size_t size, size_t align, diff --git a/include/sys/types.h b/include/sys/types.h index c60bfb208..eba23eae0 100644 --- a/include/sys/types.h +++ b/include/sys/types.h @@ -13,11 +13,6 @@ extern "C" { typedef unsigned long uintptr_t; #endif -#ifndef HAVE_KMEM_CACHE_T -typedef struct kmem_cache kmem_cache_t; -#endif -#define kmem_cache_t spl_kmem_cache_t - typedef enum { B_FALSE=0, B_TRUE=1 } boolean_t; typedef unsigned long intptr_t; typedef unsigned long ulong_t; |