Commit Graph

935 Commits

Author SHA1 Message Date
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 4df7b421a1 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-18 10:00:46 -08:00
Brian Behlendorf 229aba2943 Properly cast thread functions for pthreads 2008-12-18 09:56:22 -08:00
Brian Behlendorf 893ed2fad0 Properly cast thread functions for pthreads 2008-12-18 09:56:05 -08:00
Brian Behlendorf 0106dabb11 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-17 11:36:18 -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 eee73dd80e Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-12 16:22:59 -08:00
Brian Behlendorf d0c573f27e Add in the reset of the pthread changes 2008-12-12 16:16:06 -08:00
Brian Behlendorf abea56a45f Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2008-12-12 13:46:52 -08:00
Brian Behlendorf 37f7a4c86b Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2008-12-12 13:46:52 -08:00
Brian Behlendorf 48e775ecfc Merge branch 'fix-stack' into refs/top-bases/fix-branch 2008-12-12 13:46:51 -08:00
Brian Behlendorf f4bc961bcc Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-12 13:46:50 -08:00
Brian Behlendorf 9064b819f0 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-12 13:46:49 -08:00
Brian Behlendorf 12081e20dd Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2008-12-12 13:46:49 -08:00
Brian Behlendorf 204f1a0552 Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-12 13:46:48 -08:00
Brian Behlendorf d0a71781ca Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-12 13:46:48 -08:00
Brian Behlendorf 8eee4b7531 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2008-12-12 13:46:47 -08:00
Brian Behlendorf 0ce1ed271c Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2008-12-12 13:46:47 -08:00
Brian Behlendorf eb83f9e5cc Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2008-12-12 13:46:46 -08:00
Brian Behlendorf 9426f6f4ef Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-12 13:46:45 -08:00
Brian Behlendorf c858ba1738 Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-12 13:46:44 -08:00
Brian Behlendorf 1552cfe535 Merge branch 'fix-locks' into refs/top-bases/fix-branch 2008-12-12 13:46:44 -08:00
Brian Behlendorf 97b291fd51 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-12 13:46:43 -08:00
Brian Behlendorf 0ff28129e5 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2008-12-12 13:46:43 -08:00
Brian Behlendorf 9f9808112e Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2008-12-12 13:46:42 -08:00
Brian Behlendorf ef1a736ff4 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2008-12-12 13:46:41 -08:00
Brian Behlendorf 7fe25e59b1 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2008-12-12 13:46:40 -08:00
Brian Behlendorf 4d2df1bc04 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2008-12-12 13:46:40 -08:00
Brian Behlendorf 62b40a0cc2 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-12 13:46:39 -08:00
Brian Behlendorf 3dbc2a89ef Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2008-12-12 13:46:39 -08:00
Brian Behlendorf 6caaa9d2b1 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2008-12-12 13:46:38 -08:00
Brian Behlendorf 895c42c6bf Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2008-12-12 13:46:38 -08:00
Brian Behlendorf 746076bc95 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-12 13:46:37 -08:00
Brian Behlendorf e9c54f33b9 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-12 13:46:36 -08:00
Brian Behlendorf 810db7e0a2 Remove zcommon reference merged in to zpool 2008-12-12 13:41:20 -08:00
Brian Behlendorf 1ad6b1ec76 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2008-12-11 15:40:41 -08:00
Brian Behlendorf ef421a7c63 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2008-12-11 15:40:41 -08:00
Brian Behlendorf 690f91d041 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-11 15:40:40 -08:00
Brian Behlendorf 433a85a43c Merge branch 'fix-stack' into refs/top-bases/fix-branch 2008-12-11 15:40:40 -08:00
Brian Behlendorf 06535858db Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2008-12-11 15:40:39 -08:00
Brian Behlendorf 70227f55c1 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-11 15:40:38 -08:00
Brian Behlendorf 1ccd0b2b09 Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-11 15:40:37 -08:00
Brian Behlendorf c2b5336408 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-11 15:40:37 -08:00
Brian Behlendorf 707baca025 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2008-12-11 15:40:36 -08:00
Brian Behlendorf d702c1b8c8 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2008-12-11 15:40:36 -08:00
Brian Behlendorf 2e610572b7 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2008-12-11 15:40:35 -08:00
Brian Behlendorf a7f9b0945b Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-11 15:40:34 -08:00
Brian Behlendorf 0e2a3e83d9 Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-11 15:40:33 -08:00
Brian Behlendorf 3deceede71 Merge branch 'fix-locks' into refs/top-bases/fix-branch 2008-12-11 15:40:33 -08:00