Commit Graph

1866 Commits

Author SHA1 Message Date
Brian Behlendorf de9d49a2b4 Minor mutex tweaks 2008-12-12 13:38:13 -08:00
Brian Behlendorf b127f72a15 Resolve mutex conflict 2008-12-12 12:55:33 -08:00
Brian Behlendorf ab95bc7c7b Add missing ; 2008-12-12 12:21:58 -08:00
Brian Behlendorf 1ff495a2cc Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 12:16:41 -08:00
Brian Behlendorf ac9f5a5af0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-12 12:13:43 -08:00
Brian Behlendorf 0f99484285 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-12 12:13:41 -08:00
Brian Behlendorf e1db87107d Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-12 12:13:40 -08:00
Brian Behlendorf 95f0795156 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-12 12:13:39 -08:00
Brian Behlendorf 769681a8b9 Trivial umem implementation if portable umem unavailable 2008-12-12 12:10:00 -08:00
Brian Behlendorf ea6e9380e7 Add void to prototype 2008-12-12 11:12:11 -08:00
Brian Behlendorf bbaded4a68 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 11:07:48 -08:00
Brian Behlendorf ded433714f Refine Makefiles 2008-12-12 11:04:44 -08:00
Brian Behlendorf 33833181c1 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 11:00:07 -08:00
Brian Behlendorf 9fbc572a59 Refine Makefiles 2008-12-12 10:57:05 -08:00
Brian Behlendorf bef1b1cd5b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 10:45:38 -08:00
Brian Behlendorf d7ec1ed532 Refine Makefiles 2008-12-12 10:43:39 -08:00
Brian Behlendorf 6d0d603ee1 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 10:38:51 -08:00
Brian Behlendorf 76e1c54125 Refine Makefiles 2008-12-12 10:36:14 -08:00
Brian Behlendorf 2fcd44d670 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 10:30:37 -08:00
Brian Behlendorf f429331a49 Remove redundant build options 2008-12-12 10:27:10 -08:00
Brian Behlendorf d06634c325 Resolve shadow conflict with 'link' local 2008-12-12 10:24:38 -08:00
Brian Behlendorf 444bdde2f2 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 10:19:00 -08:00
Brian Behlendorf 2d5777f9a7 Use AM_CFLAGS 2008-12-12 10:15:59 -08:00
Brian Behlendorf 662df0d70a Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 10:13:19 -08:00
Brian Behlendorf 6d78e69193 Add missing include patch 2008-12-12 10:10:16 -08:00
Brian Behlendorf 2e0a5f5461 Refresh makefiles and configure.ac 2008-12-12 09:30:42 -08:00
Brian Behlendorf 983c10c8c1 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 09:23:36 -08:00
Brian Behlendorf 7005de9a0c Refresh Makefile.am's 2008-12-12 09:20:33 -08:00
Brian Behlendorf 85e026f310 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 08:53:32 -08:00
Brian Behlendorf d4ae03c700 Add initial stub makefile, details need filling in 2008-12-12 08:50:07 -08:00
Brian Behlendorf ceca9a6705 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-11 16:57:34 -08:00
Brian Behlendorf f55d6ad125 Remove bugus checks for now 2008-12-11 16:51:09 -08:00
Brian Behlendorf 3540a5e4e5 Readd 2008-12-11 16:46:07 -08:00
Brian Behlendorf e0104bd422 Remove so they can be easily readded 2008-12-11 16:41:23 -08:00
Brian Behlendorf a928ca95fc Add to Makefile.am 2008-12-11 16:25:33 -08:00
Brian Behlendorf 9eb741a1fe Readd missing header 2008-12-11 16:23:35 -08:00
Brian Behlendorf 1bd53d68b2 Refresh 2008-12-11 16:20:26 -08:00
Brian Behlendorf e4fae8e3d4 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-11 15:41:52 -08:00
Brian Behlendorf a0e625a878 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 15:41:52 -08:00
Brian Behlendorf 2308a268a5 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-11 15:41:51 -08:00
Brian Behlendorf eefa9ab3ab Merge commit 'refs/top-bases/feature-branch' into feature-branch 2008-12-11 15:41:51 -08:00
Brian Behlendorf 12389cbaaf Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2008-12-11 15:41:51 -08:00
Brian Behlendorf 843ecec587 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-11 15:41:50 -08:00
Brian Behlendorf a557668285 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-11 15:41:49 -08:00
Brian Behlendorf 9e0b8ff76f Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-11 15:41:48 -08:00
Brian Behlendorf 182754d11a Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 15:41:48 -08:00
Brian Behlendorf a442f70b33 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-11 15:41:47 -08:00
Brian Behlendorf c41f16e355 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2008-12-11 15:41:47 -08:00
Brian Behlendorf 66b04c1abb Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2008-12-11 15:41:46 -08:00
Brian Behlendorf d35a0f25fe Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 15:41:45 -08:00