Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-19 10:18:12 -08:00
commit 9de4108779
1 changed files with 1 additions and 0 deletions

View File

@ -297,6 +297,7 @@ extern void kstat_delete(kstat_t *);
* Kernel memory * Kernel memory
*/ */
#define KM_SLEEP UMEM_NOFAIL #define KM_SLEEP UMEM_NOFAIL
#define KM_PUSHPAGE KM_SLEEP
#define KM_NOSLEEP UMEM_DEFAULT #define KM_NOSLEEP UMEM_DEFAULT
#define KMC_NODEBUG UMC_NODEBUG #define KMC_NODEBUG UMC_NODEBUG
#define kmem_alloc(_s, _f) umem_alloc(_s, _f) #define kmem_alloc(_s, _f) umem_alloc(_s, _f)