Commit Graph

3013 Commits

Author SHA1 Message Date
Brian Behlendorf 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
Brian Behlendorf 7f3ee7a5ef Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-09 12:26:00 -07:00
Brian Behlendorf e945770943 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-09 12:25:58 -07:00
Brian Behlendorf 0c3f631b72 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-09 12:25:32 -07:00
Brian Behlendorf c4c4afd8fd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-09 12:23:41 -07:00
Brian Behlendorf 6db8882b78 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 12:23:39 -07:00
Brian Behlendorf 14445eaa8e Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-09 12:23:37 -07:00
Brian Behlendorf 76bf02aebb Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-07-09 12:23:36 -07:00
Brian Behlendorf 076406cfe3 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-07-09 12:23:35 -07:00
Brian Behlendorf a551134b2f Unitialized variables should be handled in the gcc-uninit topic branch. 2009-07-09 12:14:56 -07:00
Brian Behlendorf a19906fe65 Unitialized variables should be handled in the gcc-uninit topic branch. 2009-07-09 12:13:56 -07:00
Brian Behlendorf 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
Brian Behlendorf 2018d0e610 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-09 10:41:54 -07:00
Brian Behlendorf 7a724b1db0 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-09 10:41:53 -07:00
Brian Behlendorf 64e827d295 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-09 10:41:30 -07:00
Brian Behlendorf e5e94c40f7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-09 10:39:44 -07:00
Brian Behlendorf aa8ed32ee8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 10:39:43 -07:00
Brian Behlendorf b2eb5a454b Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-09 10:39:42 -07:00
Brian Behlendorf 9e394e10a9 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-07-09 10:39:41 -07:00
Brian Behlendorf 43af29de5f Type int accidentally not declared at the top of the function. 2009-07-09 10:19:02 -07:00
Brian Behlendorf 34cf67f0ed Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-08 16:10:23 -07:00
Brian Behlendorf 158167cc72 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-08 16:10:22 -07:00
Brian Behlendorf 664f17e68b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-08 16:09:59 -07:00
Brian Behlendorf 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
Brian Behlendorf 4103d86faa Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-08 15:02:57 -07:00
Brian Behlendorf 4ba38f1259 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-08 15:02:56 -07:00
Brian Behlendorf d95ee13c20 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-08 15:02:31 -07:00
Brian Behlendorf 058a25a017 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-08 15:00:43 -07:00
Brian Behlendorf 275d66171b Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-08 15:00:41 -07:00
Brian Behlendorf 151315f7cb Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-07-08 15:00:40 -07:00
Brian Behlendorf fa35bfd3cf Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-07-08 15:00:39 -07:00
Brian Behlendorf 57ae3b59e9 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2009-07-08 15:00:39 -07:00
Brian Behlendorf 2caba8e240 Add new DMU_READ_PREFETCH flag to dmu_read(). 2009-07-08 14:51:55 -07:00
Brian Behlendorf 1ab1b8502b Stop the kthread/thread/pthread mixing and matching insanity. Update all
code to only use the kthread API regardless of if it is compiled in the
kernel or user space.  The kthread API will be layered on top of pthreads
as best as possible in zfs_context, this is non optimal but much clearer.
2009-07-08 14:47:23 -07:00
Brian Behlendorf 0d73002d8d Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-08 09:18:20 -07:00
Brian Behlendorf 1e0e588128 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-08 09:18:18 -07:00
Brian Behlendorf 1355255010 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-08 09:17:52 -07:00
Brian Behlendorf 33077ad631 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-08 09:16:05 -07:00
Brian Behlendorf f00e6fe5c3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-08 09:16:04 -07:00
Brian Behlendorf a8ce5c16d6 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-08 09:16:03 -07:00
Brian Behlendorf 23cff295e2 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-07-08 09:16:02 -07:00
Brian Behlendorf 5fc46112cb Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-07-08 09:16:01 -07:00
Brian Behlendorf b2e459dab0 Add explicit casts for (u_longlong_t) when printing uint64_t. 2009-07-08 09:07:13 -07:00
Brian Behlendorf 5534447477 Add explicit casts for (u_longlong_t) when printing uint64_t. 2009-07-08 09:06:03 -07:00
Brian Behlendorf 58f5e63293 Resolve a 2 new cases of for loop variable declared in for() 2009-07-08 09:05:37 -07:00
Brian Behlendorf b2dcbdf490 Resolve a 2 new cases of for loop variable declared in for() 2009-07-08 09:04:21 -07:00
Brian Behlendorf 6bc6e35298 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-07 16:32:58 -07:00
Brian Behlendorf 8028fd5db5 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-07 16:32:57 -07:00
Brian Behlendorf deacdbc785 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-07 16:32:34 -07:00
Brian Behlendorf 0a00d10c24 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-07 16:30:57 -07:00