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

Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw

This commit is contained in:
Brian Behlendorf 2008-12-23 13:13:37 -08:00
parent b4c584906e 4177b4715d
commit 642a64b7bd
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/zcommon/Makefile.in
View File

@ -5,10 +5,10 @@ DISTFILES += zfs_prop.c zpool_prop.c zprop_common.c
MODULE := zcommon MODULE := zcommon
EXTRA_CFLAGS = @KERNELCPPFLAGS@ EXTRA_CFLAGS = @KERNELCPPFLAGS@
EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
EXTRA_CFLAGS += -I@MODDIR@/spl/include
EXTRA_CFLAGS += -I@MODDIR@/avl/include EXTRA_CFLAGS += -I@MODDIR@/avl/include
EXTRA_CFLAGS += -I@MODDIR@/nvpair/include EXTRA_CFLAGS += -I@MODDIR@/nvpair/include
EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
EXTRA_CFLAGS += -I@MODDIR@/zfs/include
obj-m := ${MODULE}.o obj-m := ${MODULE}.o

18
module/zcommon/zfs_prop.c
View File

@ -514,4 +514,22 @@ EXPORT_SYMBOL(zfs_prop_user);
EXPORT_SYMBOL(zfs_prop_index_to_string); EXPORT_SYMBOL(zfs_prop_index_to_string);
EXPORT_SYMBOL(zfs_prop_string_to_index); EXPORT_SYMBOL(zfs_prop_string_to_index);
EXPORT_SYMBOL(zfs_prop_valid_for_type); EXPORT_SYMBOL(zfs_prop_valid_for_type);
static int __init zcommon_init(void)
{
return 0;
}
static void zcommon_fini(void)
{
return;
}
module_init(zcommon_init);
module_exit(zcommon_fini);
MODULE_AUTHOR("Sun Microsystems, Inc");
MODULE_DESCRIPTION("Generic ZFS support");
MODULE_LICENSE("CDDL");
#endif #endif

2
module/zfs/include/sys/zfs_context.h
View File

@ -64,8 +64,6 @@ extern "C" {
#include <sys/sysevent/eventdefs.h> #include <sys/sysevent/eventdefs.h>
#include <sys/fm/util.h> #include <sys/fm/util.h>
#define CPU_SEQID (CPU->cpu_seqid)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif