diff options
| author | behlendo <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c> | 2008-05-15 23:39:19 +0000 |
|---|---|---|
| committer | behlendo <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c> | 2008-05-15 23:39:19 +0000 |
| commit | 6ab69573ffc79db6fcd0539218e96ded41fcafc1 (patch) | |
| tree | a0f63b3afb4bdbe65e4bdd5a8d4eb91280c60ff9 | |
| parent | 56f924533023e39edfda09cf1a9c47b4abfe57c7 (diff) | |
SPL additions to increase support for updated ZFS build
git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@110 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c
| -rw-r--r-- | include/sys/buf.h | 4 | ||||
| -rw-r--r-- | include/sys/dumphdr.h | 4 | ||||
| -rw-r--r-- | include/sys/kmem.h | 2 | ||||
| -rw-r--r-- | include/sys/sunddi.h | 11 | ||||
| -rw-r--r-- | include/sys/vmsystm.h | 11 |
5 files changed, 24 insertions, 8 deletions
diff --git a/include/sys/buf.h b/include/sys/buf.h new file mode 100644 index 000000000..b6627301f --- /dev/null +++ b/include/sys/buf.h @@ -0,0 +1,4 @@ +#ifndef _SPL_BUF_H +#define _SPL_BUF_H + +#endif /* SPL_BUF_H */ diff --git a/include/sys/dumphdr.h b/include/sys/dumphdr.h new file mode 100644 index 000000000..fe4087317 --- /dev/null +++ b/include/sys/dumphdr.h @@ -0,0 +1,4 @@ +#ifndef _SPL_DUMPHDR_H +#define _SPL_DUMPHDR_H + +#endif /* SPL_DUMPHDR_H */ diff --git a/include/sys/kmem.h b/include/sys/kmem.h index d630024ae..1f9bb221d 100644 --- a/include/sys/kmem.h +++ b/include/sys/kmem.h @@ -24,7 +24,7 @@ extern "C" { #define KM_SLEEP GFP_KERNEL #define KM_NOSLEEP GFP_ATOMIC #undef KM_PANIC /* No linux analog */ -#define KM_PUSHPAGE (GFP_KERNEL | GFP_HIGH) +#define KM_PUSHPAGE (GFP_KERNEL | __GFP_HIGH) #define KM_VMFLAGS GFP_LEVEL_MASK #define KM_FLAGS __GFP_BITS_MASK diff --git a/include/sys/sunddi.h b/include/sys/sunddi.h index c3f3e38cc..660fd0293 100644 --- a/include/sys/sunddi.h +++ b/include/sys/sunddi.h @@ -146,6 +146,17 @@ typedef struct modldrv { #define getmajor(x) (x) #define ddi_driver_major(di) getmajor(di->di_dev) +#define DDI_DEV_T_NONE ((dev_t)-1) +#define DDI_DEV_T_ANY ((dev_t)-2) +#define DDI_MAJOR_T_UNKNOWN ((major_t)0) + +#define DDI_PROP_DONTPASS 0x0001 +#define DDI_PROP_CANSLEEP 0x0002 + +#define ddi_prop_lookup_string(x1,x2,x3,x4,x5) (*x5 = NULL) +#define ddi_prop_free(x) (void)0 +#define ddi_root_node() (void)0 + #define mod_install(x) 0 #define mod_remove(x) 0 diff --git a/include/sys/vmsystm.h b/include/sys/vmsystm.h index fb9ff9710..09f88d750 100644 --- a/include/sys/vmsystm.h +++ b/include/sys/vmsystm.h @@ -2,12 +2,16 @@ #define _SPL_VMSYSTM_H #include <linux/mm.h> +#include <linux/swap.h> #include <sys/types.h> #include <asm/uaccess.h> extern vmem_t *zio_alloc_arena; /* arena for zio caches */ #define physmem num_physpages +#define freemem nr_free_pages() /* Expensive on linux, + cheap on solaris */ +#define minfree 0 #define ptob(pages) (pages * PAGE_SIZE) #define membar_producer() smp_wmb() @@ -56,9 +60,6 @@ copyinstr(const void *from, void *to, size_t len, size_t *done) } #if 0 -/* The approximate total number of free pages */ -#define freemem 0 - /* The average number of free pages over the last 5 seconds */ #define avefree 0 @@ -81,10 +82,6 @@ copyinstr(const void *from, void *to, size_t len, size_t *done) /* When free memory is above this limit, swapping is not performed */ #define desfree 0 - -/* Threshold for many low memory tests, e.g. swapping is - * more active below this limit */ -#define minfree 0 #endif #endif /* SPL_VMSYSTM_H */ |