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

This commit is contained in:
Brian Behlendorf 2008-12-19 10:11:32 -08:00
commit b630c17896
1 changed files with 21 additions and 17 deletions

View File

@ -53,6 +53,13 @@ typedef u_longlong_t u_offset_t;
typedef u_longlong_t len_t;
typedef longlong_t diskaddr_t;
typedef ulong_t pfn_t; /* page frame number */
typedef ulong_t pgcnt_t; /* number of pages */
typedef long spgcnt_t; /* signed number of pages */
typedef longlong_t hrtime_t;
typedef struct timespec timestruc_t;
typedef short pri_t;
typedef int zoneid_t;
@ -88,7 +95,4 @@ typedef union {
} lloff_t;
#endif
typedef longlong_t hrtime_t;
typedef struct timespec timestruc_t;
#endif