Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
This commit is contained in:
commit
a9c201e00f
|
@ -3,8 +3,8 @@ DISTFILES = avl.c
|
||||||
|
|
||||||
MODULE := zavl
|
MODULE := zavl
|
||||||
|
|
||||||
EXTRA_CFLAGS = @KERNELCPPFLAGS@
|
EXTRA_CFLAGS = -I@MODDIR@/avl/include
|
||||||
EXTRA_CFLAGS += -I@MODDIR@/avl/include
|
EXTRA_CFLAGS += @KERNELCPPFLAGS@
|
||||||
|
|
||||||
obj-m := ${MODULE}.o
|
obj-m := ${MODULE}.o
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,8 @@ DISTFILES = nvpair.c
|
||||||
|
|
||||||
MODULE := znvpair
|
MODULE := znvpair
|
||||||
|
|
||||||
EXTRA_CFLAGS = @KERNELCPPFLAGS@
|
EXTRA_CFLAGS = -I@MODDIR@/nvpair/include
|
||||||
EXTRA_CFLAGS += -I@MODDIR@/nvpair/include
|
EXTRA_CFLAGS += @KERNELCPPFLAGS@
|
||||||
|
|
||||||
obj-m := ${MODULE}.o
|
obj-m := ${MODULE}.o
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,8 @@ DISTFILES = u8_textprep.c uconv.c
|
||||||
|
|
||||||
MODULE := zunicode
|
MODULE := zunicode
|
||||||
|
|
||||||
EXTRA_CFLAGS = @KERNELCPPFLAGS@
|
EXTRA_CFLAGS = -I@MODDIR@/unicode/include
|
||||||
EXTRA_CFLAGS += -I@MODDIR@/unicode/include
|
EXTRA_CFLAGS += @KERNELCPPFLAGS@
|
||||||
|
|
||||||
obj-m := ${MODULE}.o
|
obj-m := ${MODULE}.o
|
||||||
|
|
||||||
|
|
|
@ -45,11 +45,11 @@
|
||||||
#include <sys/ddi.h>
|
#include <sys/ddi.h>
|
||||||
#include <sys/sunddi.h>
|
#include <sys/sunddi.h>
|
||||||
#else
|
#else
|
||||||
|
#include <sys/u8_textprep.h>
|
||||||
#include <strings.h>
|
#include <strings.h>
|
||||||
#endif /* _KERNEL */
|
#endif /* _KERNEL */
|
||||||
#include <sys/byteorder.h>
|
#include <sys/byteorder.h>
|
||||||
#include <sys/errno.h>
|
#include <sys/errno.h>
|
||||||
#include <sys/u8_textprep.h>
|
|
||||||
#include <sys/u8_textprep_data.h>
|
#include <sys/u8_textprep_data.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -42,10 +42,11 @@
|
||||||
#include <sys/debug.h>
|
#include <sys/debug.h>
|
||||||
#include <sys/kmem.h>
|
#include <sys/kmem.h>
|
||||||
#include <sys/sunddi.h>
|
#include <sys/sunddi.h>
|
||||||
|
#else
|
||||||
|
#include <sys/u8_textprep.h>
|
||||||
#endif /* _KERNEL */
|
#endif /* _KERNEL */
|
||||||
#include <sys/byteorder.h>
|
#include <sys/byteorder.h>
|
||||||
#include <sys/errno.h>
|
#include <sys/errno.h>
|
||||||
#include <sys/u8_textprep.h>
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -4,12 +4,12 @@ DISTFILES += zfs_prop.c zpool_prop.c zprop_common.c
|
||||||
|
|
||||||
MODULE := zcommon
|
MODULE := zcommon
|
||||||
|
|
||||||
EXTRA_CFLAGS = @KERNELCPPFLAGS@
|
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@/unicode/include
|
EXTRA_CFLAGS += -I@MODDIR@/unicode/include
|
||||||
EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
|
EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
|
||||||
EXTRA_CFLAGS += -I@MODDIR@/zfs/include
|
EXTRA_CFLAGS += -I@MODDIR@/zfs/include
|
||||||
|
EXTRA_CFLAGS += @KERNELCPPFLAGS@
|
||||||
|
|
||||||
obj-m := ${MODULE}.o
|
obj-m := ${MODULE}.o
|
||||||
|
|
||||||
|
|
|
@ -11,12 +11,12 @@ DISTFILES += zfs_znode.o zil.o zio.o zio_checksum.o zio_compress.o zio_inject.o
|
||||||
|
|
||||||
MODULE := zpool
|
MODULE := zpool
|
||||||
|
|
||||||
EXTRA_CFLAGS = @KERNELCPPFLAGS@
|
EXTRA_CFLAGS = -I@MODDIR@/zfs/include
|
||||||
EXTRA_CFLAGS += -I@MODDIR@/zfs/include
|
|
||||||
EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
|
EXTRA_CFLAGS += -I@MODDIR@/zcommon/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@/unicode/include
|
EXTRA_CFLAGS += -I@MODDIR@/unicode/include
|
||||||
|
EXTRA_CFLAGS += @KERNELCPPFLAGS@
|
||||||
|
|
||||||
obj-m := ${MODULE}.o
|
obj-m := ${MODULE}.o
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue