Brian Behlendorf
72de3a8ee1
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-04-29 11:00:44 -07:00
Brian Behlendorf
151f424dd8
Strip ident pragma from module/zfs/include/sys/fm/util.h
2010-04-29 10:57:17 -07:00
Brian Behlendorf
4d5d0f9ef5
Include FMA source and headers in build system
2010-04-29 10:55:27 -07:00
Brian Behlendorf
767de139ae
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-04-29 10:43:10 -07:00
Brian Behlendorf
1368594e11
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 10:41:59 -07:00
Brian Behlendorf
ca4ad9f284
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-04-29 10:41:56 -07:00
Brian Behlendorf
9199dc112a
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-04-29 10:41:55 -07:00
Brian Behlendorf
c97d2c5541
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-04-29 10:41:53 -07:00
Brian Behlendorf
18f485a504
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-04-29 10:41:52 -07:00
Brian Behlendorf
655b4b2b1c
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-04-29 10:41:39 -07:00
Brian Behlendorf
dbda9cb8fc
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-04-29 10:41:28 -07:00
Brian Behlendorf
13668b7879
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-04-29 10:41:23 -07:00
Brian Behlendorf
f2ca1d7334
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-04-29 10:41:22 -07:00
Brian Behlendorf
34d62da9bc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-04-29 10:41:18 -07:00
Brian Behlendorf
d91c81c4df
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-04-29 10:41:09 -07:00
Brian Behlendorf
8c24800b72
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-04-29 10:40:36 -07:00
Brian Behlendorf
4aad8d3244
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-04-29 10:40:34 -07:00
Brian Behlendorf
fa42225a3d
Add Solaris FMA style support
2010-04-29 10:37:15 -07:00
Brian Behlendorf
13d740f8fa
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-09 13:25:29 -08:00
Brian Behlendorf
19eef8ad39
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-09 13:24:30 -08:00
Brian Behlendorf
9fa502c50b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-03-09 13:24:29 -08:00
Brian Behlendorf
e218fd13e8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-09 13:24:28 -08:00
Brian Behlendorf
ef359aee66
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-09 13:24:27 -08:00
Brian Behlendorf
f2ab1fea36
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-09 13:24:27 -08:00
Ricardo M. Correia
2b85024275
Use CPU percentages for number of commit cb threads.
...
This doesn't change number of threads in the kernel, but it reduces number of
threads in ztest (important due to 32-bit address limitations).
2010-03-09 13:21:20 -08:00
Brian Behlendorf
bd96142642
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-09 12:31:11 -08:00
Brian Behlendorf
8f63d438cd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-09 12:30:18 -08:00
Brian Behlendorf
48e74ed68b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-03-09 12:30:03 -08:00
Brian Behlendorf
9a3d5378c6
Clean up emulation of kernel threads in userspace.
...
Updated to use pthread thread specific data rather than keeping
a global list. This also fixes at least one easily reproducible
crash in ztest
2010-03-09 12:25:28 -08:00
Brian Behlendorf
96904978f8
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-09 10:31:19 -08:00
Brian Behlendorf
3a9850385c
Include all headers regardless of depth
...
The previous hack for this was to move headers 3 levels deep in to
the top level include dir and headers 4 levels deep in to sys.
Obviously this was fairly limiting and missed two important headers.
./zfs/include/sys/fm/fs/zfs.h
./zfs/include/sys/fs/zfs.h
This patch updates the code to be smarter and installs all the headers
to the correct location regardless of depth. Each header will have its
leading 3 path args stripped (i.e. ./zfs/include/) and replaced with
the correct install destination. All path information past the first
three levels will be preserved.
2010-03-09 10:20:34 -08:00
Brian Behlendorf
7fdea1e32f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-08 13:48:30 -08:00
Brian Behlendorf
3d7cfde000
Remove Module.markers and Module.symver{s} in clean target
...
Split 'modules' and 'clean' Makefile targets to allow us to
cleanly remove the Module.* build products with a 'make clean'.
2010-03-08 13:45:51 -08:00
Brian Behlendorf
cd66df7819
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-01-08 11:40:10 -08:00
Brian Behlendorf
303d9f010d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-01-08 11:39:31 -08:00
Brian Behlendorf
710e779a08
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-01-08 11:39:30 -08:00
Brian Behlendorf
a240c39095
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-01-08 11:39:29 -08:00
Brian Behlendorf
ee3aa7773b
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-01-08 11:39:28 -08:00
Brian Behlendorf
eaf2e3231c
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-01-08 11:39:28 -08:00
Brian Behlendorf
259647c1f1
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-01-08 11:39:23 -08:00
Brian Behlendorf
365c47de76
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-01-08 11:39:18 -08:00
Brian Behlendorf
8513efcadd
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-01-08 11:39:16 -08:00
Brian Behlendorf
c1d363770f
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-01-08 11:39:16 -08:00
Brian Behlendorf
6cb71e1dec
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-01-08 11:39:14 -08:00
Brian Behlendorf
e6f83f6a79
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-01-08 11:39:11 -08:00
Brian Behlendorf
69804965e9
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-01-08 11:39:00 -08:00
Brian Behlendorf
e69572c1b5
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-01-08 11:39:00 -08:00
Brian Behlendorf
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -08:00
Brian Behlendorf
10799d975e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-12-18 14:32:17 -08:00
Brian Behlendorf
93b5403a64
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-12-18 14:31:22 -08:00
Brian Behlendorf
1a36b0ada1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-12-18 14:31:22 -08:00
Brian Behlendorf
b58747a2e2
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-12-18 14:31:21 -08:00
Brian Behlendorf
70ddc1393f
No inline to keep dmu_recv_stream() stack frame less than 1024 bytes.
...
Recent builds against 2.6.31 flagged dmu_recv_stream() as stack heavy.
As a quick simple way to resolve this I'm preventing the inlining of
certain functions which gcc will inline here because this is the only
place they are called. Futher analysis of this function should be
performed to futher reduce its stack usage.
2009-12-18 14:22:02 -08:00
Brian Behlendorf
27417de12c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-12-11 12:08:28 -08:00
Brian Behlendorf
acd798cfd4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-12-11 12:07:23 -08:00
Brian Behlendorf
f8d093f69b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-12-11 12:07:23 -08:00
Brian Behlendorf
b76d12a644
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-12-11 12:07:22 -08:00
Brian Behlendorf
ba7ccf8ccd
Cast to unsigned long long for 32-bit arches
2009-12-11 11:41:04 -08:00
Brian Behlendorf
d1aade1c7b
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-11-20 10:31:13 -08:00
Brian Behlendorf
cac1bc41dc
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-11-20 10:29:49 -08:00
Brian Behlendorf
77c347db31
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-11-20 10:29:48 -08:00
Brian Behlendorf
0f315a58bb
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-11-20 10:29:47 -08:00
Brian Behlendorf
3191b962f6
Prevent gcc uninit compiler warning in zfs_range_unlock_reader().
2009-11-20 09:59:58 -08:00
Brian Behlendorf
bb12b54387
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-11-15 16:28:34 -08:00
Brian Behlendorf
d00a0ea8a0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-11-15 16:27:02 -08:00
Brian Behlendorf
71ccaccb2b
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-11-15 16:27:00 -08:00
Brian Behlendorf
475e214ce1
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-11-15 16:27:00 -08:00
Brian Behlendorf
65f6d4b712
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-11-15 16:26:58 -08:00
Brian Behlendorf
8c5797df77
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-11-15 16:26:58 -08:00
Brian Behlendorf
e530326e8f
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-11-15 16:26:48 -08:00
Brian Behlendorf
b57e406dd6
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-11-15 16:26:47 -08:00
Brian Behlendorf
8d0c0b0782
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-11-15 16:26:39 -08:00
Brian Behlendorf
00f3dfb5e9
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-11-15 16:26:36 -08:00
Brian Behlendorf
e57bf40c98
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-11-15 16:26:36 -08:00
Brian Behlendorf
59cbe87375
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-11-15 16:26:31 -08:00
Brian Behlendorf
123728d9ae
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2009-11-15 16:26:23 -08:00
Brian Behlendorf
4f9acff2d8
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-11-15 16:26:20 -08:00
Brian Behlendorf
217998d1a3
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-11-15 16:26:12 -08:00
Brian Behlendorf
d8aef5d7bc
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-11-15 16:25:52 -08:00
Brian Behlendorf
030d49c262
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-11-15 16:25:50 -08:00
Brian Behlendorf
0aa61e8427
Remove zvol.c when updating in update-zfs.sh Linux version available.
2009-11-15 16:20:01 -08:00
Brian Behlendorf
0076202c0f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-18 14:21:23 -07:00
Brian Behlendorf
e4b55cfbff
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 14:18:36 -07:00
Brian Behlendorf
5d83878f46
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 14:18:34 -07:00
Brian Behlendorf
ef74bed821
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-08-18 14:18:32 -07:00
Brian Behlendorf
f3ddd9d082
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-08-18 14:18:32 -07:00
Brian Behlendorf
8767bb3fdd
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-08-18 14:18:31 -07:00
Brian Behlendorf
f9a74de46a
Required build 121 updates for gcc-uninit
2009-08-18 14:09:35 -07:00
Brian Behlendorf
08f5b3c23d
Required build 121 updates for gcc-shadow
2009-08-18 14:09:15 -07:00
Brian Behlendorf
d42b88372f
Required build 121 updates for gcc-c90
2009-08-18 14:07:25 -07:00
Brian Behlendorf
917a08a678
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-18 12:34:56 -07:00
Brian Behlendorf
50c623ccef
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 12:10:55 -07:00
Brian Behlendorf
8aab887b7c
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-08-18 12:10:47 -07:00
Brian Behlendorf
5a81224e6f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-08-18 12:10:43 -07:00
Brian Behlendorf
bfbac5daec
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-08-18 12:10:38 -07:00
Brian Behlendorf
4f6bbcd0e7
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-08-18 12:10:36 -07:00
Brian Behlendorf
e20ba40c91
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-08-18 12:10:02 -07:00
Brian Behlendorf
f8cca2b295
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-08-18 12:09:57 -07:00
Brian Behlendorf
e7c05295ca
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-08-18 12:09:26 -07:00
Brian Behlendorf
d205b25a74
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-08-18 12:09:10 -07:00