Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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

This commit is contained in:
Brian Behlendorf 2010-04-29 12:34:04 -07:00
parent 00edd42487 bfd847de96
commit 821c68e73d
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libspl/include/sys/fm/util.h
View File

@ -27,4 +27,7 @@
#ifndef _LIBSPL_SYS_FM_UTIL_H #ifndef _LIBSPL_SYS_FM_UTIL_H
#define _LIBSPL_SYS_FM_UTIL_H #define _LIBSPL_SYS_FM_UTIL_H
static inline void fm_init(void) { }
static inline void fm_fini(void) { }
#endif #endif

1
module/nvpair/Makefile.in
View File

@ -7,3 +7,4 @@ obj-m := ${MODULE}.o
${MODULE}-objs += nvpair.o ${MODULE}-objs += nvpair.o
${MODULE}-objs += nvpair_alloc_spl.o ${MODULE}-objs += nvpair_alloc_spl.o
${MODULE}-objs += nvpair_alloc_fixed.o

6
module/nvpair/nvpair_alloc_fixed.c
View File

@ -24,7 +24,7 @@
* Use is subject to license terms. * Use is subject to license terms.
*/ */
#pragma ident "%Z%%M% %I% %E% SMI"
#include <sys/stropts.h> #include <sys/stropts.h>
#include <sys/isa_defs.h> #include <sys/isa_defs.h>
@ -118,3 +118,7 @@ const nv_alloc_ops_t nv_fixed_ops_def = {
}; };
const nv_alloc_ops_t *nv_fixed_ops = &nv_fixed_ops_def; const nv_alloc_ops_t *nv_fixed_ops = &nv_fixed_ops_def;
#if defined(_KERNEL) && defined(HAVE_SPL)
EXPORT_SYMBOL(nv_fixed_ops);
#endif