Commit Graph

177 Commits

Author SHA1 Message Date
Brian Behlendorf a68af79057 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-19 10:18:11 -08:00
Brian Behlendorf d4c39af7a6 Re-add KM_PUSHPAGE 2008-12-19 10:15:52 -08:00
Brian Behlendorf 330840ff2e Re-add KM_PUSHPAGE 2008-12-19 10:15:27 -08:00
Brian Behlendorf 3845f85e42 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 09:54:48 -08:00
Brian Behlendorf 530b2e6564 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 09:54:15 -08:00
Brian Behlendorf 24e15d1bb1 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 09:52:57 -08:00
Brian Behlendorf 3d8832a795 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-19 09:52:51 -08:00
Brian Behlendorf 3bc48c3e74 Missing func readd 2008-12-19 09:50:15 -08:00
Brian Behlendorf 111303eeb8 context 2008-12-19 09:47:09 -08:00
Brian Behlendorf dbc567603d Readd removed hunk 2008-12-19 09:39:17 -08:00
Brian Behlendorf 3d19534f7a Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-18 13:20:09 -08:00
Brian Behlendorf dddf2efadf Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-18 13:19:38 -08:00
Brian Behlendorf da1ceb2bbe Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 13:18:27 -08:00
Brian Behlendorf 33e499be43 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2008-12-18 13:18:15 -08:00
Brian Behlendorf 8e136cf0c9 Add noinline macro for userspace 2008-12-18 13:15:58 -08:00
Brian Behlendorf 00aa17c6b3 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-18 10:03:20 -08:00
Brian Behlendorf 7d3b45b517 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-18 10:02:51 -08:00
Brian Behlendorf 4d86e8fa92 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 10:01:44 -08:00
Brian Behlendorf 893ed2fad0 Properly cast thread functions for pthreads 2008-12-18 09:56:05 -08:00
Brian Behlendorf fe5b927a4a Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-18 09:36:22 -08:00
Brian Behlendorf 0a6ac25d10 Add vmem_ interface mapping for user space 2008-12-18 09:34:27 -08:00
Brian Behlendorf eebeedfaff Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-17 11:37:52 -08:00
Brian Behlendorf e0f0e02636 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 11:36:22 -08:00
Brian Behlendorf ed9a35324d Not sure why Sun needed to remove these externs, but I need them back 2008-12-17 11:32:47 -08:00
Brian Behlendorf bcbf74fead Remove assert/verify support from zfs_context, moved to assert.h 2008-12-17 09:49:02 -08:00
Brian Behlendorf d0c573f27e Add in the reset of the pthread changes 2008-12-12 16:16:06 -08:00
Brian Behlendorf 77755a5771 Add a few missing files 2008-12-11 11:14:49 -08:00