5753d78dcd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-14 16:49:29 -07:00
e9d7526fb3
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-07-14 16:49:27 -07:00
407a09cf3e
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-07-14 16:49:23 -07:00
8d55cf8c97
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-07-14 16:49:22 -07:00
5ef898a106
Update TODO by removing out of date failure modes.
...
From what I've seen so far the pthreads cleanup has addressed
most/all of the pthread_* related crashes in ztest.
2009-07-14 16:36:28 -07:00
a13cdecdd2
Remove debug printf
2009-07-14 16:35:13 -07:00
426661d59e
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-14 14:39:23 -07:00
fef9a2c571
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-14 14:34:39 -07:00
9b9f17a585
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-07-14 14:34:37 -07:00
6923d172c5
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-07-14 14:34:36 -07:00
605a501311
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-07-14 14:34:35 -07:00
864e44e7e0
Provide correct kthread API semantics using pthreads.
...
The intent here is to fully remove the previous Solaris thread
implementation so we don't need to simulate both Solaris kernel
and user space thread APIs. The few user space consumers of the
thread API have been updated to use the kthread API. In order
to support this we needed to more fully support the kthread API
and that means not doing crazy things like casting a thread id
to a pointer and using that as was done before. This first
implementation is not effecient but it does provide all the
corrent semantics. If/when performance becomes and issue we
can and should just natively adopt pthreads which is portable.
Let me finish by saying I'm not proud of any of this and I would
love to see it improved. However, this slow implementation does
at least provide all the correct kthread API semantics whereas
the previous method of casting the thread ID to a pointer was
dodgy at best.
2009-07-14 14:16:26 -07:00
60f6986949
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-10 11:53:21 -07:00
e16ffab302
SPLBUILD now includes modules
2009-07-10 11:37:30 -07:00
8ca42760e8
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-10 10:54:48 -07:00
4baa59ce44
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-10 10:50:13 -07:00
cfec48619c
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-10 10:50:12 -07:00
1817377ecd
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-07-10 10:50:11 -07:00
84b52133f3
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-10 10:50:10 -07:00
f3c55459b0
Pull ; in to macro to ensure it get's entirely removed, C90 issue.
2009-07-10 10:40:55 -07:00
eefe365599
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-09 15:12:15 -07:00
24662d61d9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 15:08:06 -07:00
2f4e745a09
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 15:08:04 -07:00
893e11c6be
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-07-09 15:08:03 -07:00
bed14af385
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-07-09 15:08:03 -07:00
ae132945b4
Add suggested paranthesis.
2009-07-09 14:59:10 -07:00
91ca27b520
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-09 13:21:52 -07:00
17d368fa5f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 13:17:27 -07:00
a3bc97c2c3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 13:17:26 -07:00
947db84a82
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-07-09 13:17:25 -07:00
9ad0fef49e
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
...
Conflicts:
module/nvpair/nvpair.c
2009-07-09 13:08:30 -07:00
683b2f0d00
TopGit missed this update when I updated the same line in the
...
gcc-unused and gcc-uninit topic branches at the same time and
then ran 'tg update'. I'll need to keep that sort of thing
in mind when updating multiple topic branches between updates.
2009-07-09 13:07:05 -07:00
5317697272
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-09 12:28:15 -07:00
c4c4afd8fd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 12:23:41 -07:00
6db8882b78
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 12:23:39 -07:00
14445eaa8e
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-07-09 12:23:37 -07:00
76bf02aebb
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-09 12:23:36 -07:00
076406cfe3
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-07-09 12:23:35 -07:00
a551134b2f
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:14:56 -07:00
a19906fe65
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:13:56 -07:00
f1d99c0653
Revert to original debugging code and wrap any variabled used only
...
within an ASSERT with the ASSERTV macro which will ensure it will
be removed when the ASSERTs are commented out. This makes gcc much
happier, makes the variables usage explicit, and removes the need
for the compiler to detect it is unused and do the right thing.
2009-07-09 12:10:52 -07:00
31b1f1f000
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-09 10:43:55 -07:00
e5e94c40f7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 10:39:44 -07:00
aa8ed32ee8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 10:39:43 -07:00
b2eb5a454b
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-07-09 10:39:42 -07:00
9e394e10a9
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-07-09 10:39:41 -07:00
43af29de5f
Type int accidentally not declared at the top of the function.
2009-07-09 10:19:02 -07:00
9989280a8d
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-08 16:12:25 -07:00
8070ba7bea
Untracked pthread changes which must have accidentally crept in.
...
This is exactly the reason why I want a new topgit command which
takes the base, then incrementally applies all the patches and
compares them againsts what is actually committed. This would
ensure this sort of thing doesn't happen!
2009-07-08 15:58:28 -07:00
90b4752aa3
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-08 15:05:04 -07:00
Brian Behlendorf