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

Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-07-21 10:08:28 -07:00
parent 8aff93fb24 8a8a5ae7af
commit 230b75fe2d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libzpool/Makefile.am
View File

@ -153,3 +153,5 @@ libzpool_la_SOURCES = \
${top_srcdir}/module/zfs/include/sys/fm/protocol.h \ ${top_srcdir}/module/zfs/include/sys/fm/protocol.h \
${top_srcdir}/module/zfs/include/sys/fm/util.h \ ${top_srcdir}/module/zfs/include/sys/fm/util.h \
${top_srcdir}/module/zfs/include/sys/fm/fs/zfs.h ${top_srcdir}/module/zfs/include/sys/fm/fs/zfs.h
libzpool_la_LDFLAGS = -pthread

2
lib/libzpool/include/sys/zfs_context.h
View File

@ -147,7 +147,7 @@ extern void vpanic(const char *, __va_list);
*/ */
#define TS_MAGIC 0x72f158ab4261e538ull #define TS_MAGIC 0x72f158ab4261e538ull
#define TS_RUN 0x00000002 #define TS_RUN 0x00000002
#ifdef _linux_ #ifdef __linux__
#define STACK_SIZE 8192 /* Linux x86 and amd64 */ #define STACK_SIZE 8192 /* Linux x86 and amd64 */
#else #else
#define STACK_SIZE 24576 /* Solaris */ #define STACK_SIZE 24576 /* Solaris */