Commit Graph

23 Commits

Author SHA1 Message Date
Brian Behlendorf 2a80af91ed Remove nvpair_alloc_system.c change in libspl topic branch.
A change to the nvpair implementation should not have been made in
the libspl-topic branch.  This patch fixes that accident by reverting
the change and providing the missing libspl header to allow the
proper building of nvpair_alloc_system.c without the need to modify it.
2010-05-18 12:47:08 -07:00
Brian Behlendorf 821a652a56 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-05-14 11:01:17 -07:00
Brian Behlendorf 20ee89f0f2 Add nvpair_alloc_fixed.c in to libnvpair build. 2010-05-14 10:55:02 -07:00
Brian Behlendorf 3a23753b70 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-11 11:20:30 -07:00
Brian Behlendorf dff484a388 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 11:09:13 -07:00
Brian Behlendorf 8fe801fd8f Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2009-03-11 11:00:42 -07:00
Ricardo M. Correia af45030850 Added 'gcc-ident-pragmas' branch. 2009-03-11 10:59:45 -07:00
Brian Behlendorf c1e34481d8 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-17 13:38:38 -08:00
Brian Behlendorf ba3d5afa54 Add missing \ 2008-12-17 13:35:06 -08:00
Brian Behlendorf eb2a7c5200 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 09:06:37 -08:00
Brian Behlendorf a7b063d224 Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -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 be5e4ee04f Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-11 15:00:50 -08:00
Brian Behlendorf 593aa3e10d Move all current Makefiles to correct locations, updates still needed 2008-12-11 14:55:55 -08:00
Brian Behlendorf a4a44a76d4 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-11 14:27:09 -08:00
Brian Behlendorf 503068ecec Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 14:25:32 -08:00
Brian Behlendorf 82c8f9af50 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 14:24:49 -08:00
Brian Behlendorf a4076c7544 Script updates 2008-12-11 14:21:14 -08:00
Brian Behlendorf c4911ece24 Move library files to lib 2008-12-11 14:16:55 -08:00
Brian Behlendorf 98ce19f04c Update avl, nvpair, spl to unique build dirs 2008-12-11 13:54:57 -08:00