From f1a28f535cdc5dea96ead985199698ef555e52b6 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 29 Apr 2010 12:21:24 -0700 Subject: [PATCH 1/4] Export required nv_alloc_fixed symbols. --- module/nvpair/nvpair_alloc_fixed.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/module/nvpair/nvpair_alloc_fixed.c b/module/nvpair/nvpair_alloc_fixed.c index b1128eeb9b..d99a36798f 100644 --- a/module/nvpair/nvpair_alloc_fixed.c +++ b/module/nvpair/nvpair_alloc_fixed.c @@ -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; + +#if defined(_KERNEL) && defined(HAVE_SPL) +EXPORT_SYMBOL(nv_fixed_ops); +#endif From f26fce7b17e2528bc69718d3755a51b6fe866c39 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 29 Apr 2010 12:23:12 -0700 Subject: [PATCH 2/4] Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c --- module/nvpair/nvpair_alloc_fixed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/nvpair/nvpair_alloc_fixed.c b/module/nvpair/nvpair_alloc_fixed.c index b1128eeb9b..33e3c0d007 100644 --- a/module/nvpair/nvpair_alloc_fixed.c +++ b/module/nvpair/nvpair_alloc_fixed.c @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + #include #include From 89154c98f923b98eed01e903477e7f56ae51ca19 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 29 Apr 2010 12:24:25 -0700 Subject: [PATCH 3/4] Update build system to include nvpair_alloc_fixed.c. --- module/nvpair/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/module/nvpair/Makefile.in b/module/nvpair/Makefile.in index acd9ac4f99..3f643e724d 100644 --- a/module/nvpair/Makefile.in +++ b/module/nvpair/Makefile.in @@ -7,3 +7,4 @@ obj-m := ${MODULE}.o ${MODULE}-objs += nvpair.o ${MODULE}-objs += nvpair_alloc_spl.o +${MODULE}-objs += nvpair_alloc_fixed.o From c14cca5c072a703c0791e676268899930455316d Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 29 Apr 2010 12:25:18 -0700 Subject: [PATCH 4/4] Add fm_init/fm_fini stubs for user space FMA update. --- lib/libspl/include/sys/fm/util.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libspl/include/sys/fm/util.h b/lib/libspl/include/sys/fm/util.h index 564d0b5b5a..c7ba55ecd4 100644 --- a/lib/libspl/include/sys/fm/util.h +++ b/lib/libspl/include/sys/fm/util.h @@ -27,4 +27,7 @@ #ifndef _LIBSPL_SYS_FM_UTIL_H #define _LIBSPL_SYS_FM_UTIL_H +static inline void fm_init(void) { } +static inline void fm_fini(void) { } + #endif