Commit Graph

408 Commits

Author SHA1 Message Date
Brian Behlendorf 1b6dee2506 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-07 15:52:40 -08:00
Brian Behlendorf fdc9b1d377 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-07 15:52:39 -08:00
Brian Behlendorf 53a6418874 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-07 15:52:31 -08:00
Brian Behlendorf 2a76f03369 Update distfiles 2009-01-07 15:49:36 -08:00
Brian Behlendorf f30cedbaf3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 13:46:09 -08:00
Brian Behlendorf 1420cd5581 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 13:46:09 -08:00
Brian Behlendorf f01d7c3dba Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-06 13:46:02 -08:00
Brian Behlendorf 6280843d13 Remove until it can be updated 2009-01-06 13:43:53 -08:00
Brian Behlendorf 09a5a916ec Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 13:16:49 -08:00
Brian Behlendorf 0e16147946 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 13:16:49 -08:00
Brian Behlendorf 74bff69746 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-06 13:16:42 -08:00
Brian Behlendorf f9494f2bb1 Build missing sources 2009-01-06 13:14:30 -08:00
Brian Behlendorf b9b559258c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 13:01:38 -08:00
Brian Behlendorf 6842512863 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 13:01:37 -08:00
Brian Behlendorf 57aad95a52 Refresh exported symbols 2009-01-06 12:59:50 -08:00
Brian Behlendorf 461db1ecc9 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 09:40:31 -08:00
Brian Behlendorf 889a81fcf2 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 09:40:30 -08:00
Brian Behlendorf da647d38a3 Refresh exported symbols, remove zio_resume_threads as out of date 2009-01-06 09:38:39 -08:00
Brian Behlendorf ac63920b2c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 09:30:36 -08:00
Brian Behlendorf abca9d8b9a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 09:30:36 -08:00
Brian Behlendorf bc820e95a6 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-06 09:30:29 -08:00
Brian Behlendorf 5f9b0590f5 Remove zfs_fuid for now from kernel source until needed by ZPL 2009-01-06 09:28:09 -08:00
Brian Behlendorf f6f3c46840 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 09:16:17 -08:00
Brian Behlendorf e4a4ad147a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 09:16:16 -08:00
Brian Behlendorf d71643eb94 Refresh exported symbols 2009-01-06 09:14:10 -08:00
Brian Behlendorf 43e4426b34 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 09:03:52 -08:00
Brian Behlendorf b521002205 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 09:03:51 -08:00
Brian Behlendorf 1c496f0235 Refresh exported spa_config symbols 2009-01-06 08:59:36 -08:00
Brian Behlendorf 3edbae3a2d Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 16:59:20 -08:00
Brian Behlendorf 7feda9d67d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 16:59:18 -08:00
Brian Behlendorf 90ff526841 Remove symbol exports no longer needed with the dsl scrub rewrite 2009-01-05 16:55:15 -08:00
Brian Behlendorf 4f8a8bc8da Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 16:39:44 -08:00
Brian Behlendorf 7b1eb5d131 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 16:39:42 -08:00
Brian Behlendorf d763974558 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 16:39:26 -08:00
Brian Behlendorf 9d4d588938 Comment out until ZPL implemented 2009-01-05 16:34:01 -08:00
Brian Behlendorf 2800480736 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 16:00:42 -08:00
Brian Behlendorf 867b188b30 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 16:00:41 -08:00
Brian Behlendorf 76d40e2e81 Update exported symbols 2009-01-05 15:58:50 -08:00
Brian Behlendorf a9c201e00f Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 15:45:13 -08:00
Brian Behlendorf ef0cd2992f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 15:45:12 -08:00
Brian Behlendorf b2db87f254 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 15:45:05 -08:00
Brian Behlendorf 760d78b9f8 Move default include paths after custom include paths so local stuff gets picked up first 2009-01-05 15:42:56 -08:00
Brian Behlendorf 4c741b2f9d Revert changes and resolve include issue by adjusting include path ordering 2009-01-05 15:40:56 -08:00
Brian Behlendorf bb4ca885b5 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 15:21:19 -08:00
Brian Behlendorf 5b2b7fc3df Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 15:21:19 -08:00
Brian Behlendorf eb58273a29 Update exported symbol names for new traversal code 2009-01-05 15:19:35 -08:00
Brian Behlendorf 74245215c4 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 14:28:40 -08:00
Brian Behlendorf d1c8781815 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 14:28:39 -08:00
Brian Behlendorf ec462ce48f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 14:28:33 -08:00
Brian Behlendorf a4ecacdad7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-05 14:28:00 -08:00
Brian Behlendorf 93e72d1102 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-05 14:27:59 -08:00
Brian Behlendorf 854fda6d70 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-01-05 14:27:58 -08:00
Brian Behlendorf 12ee6d57c8 Avoid using { 0 } assignment because it assume certain things about the condvar and mutex typedefs which may not be true 2009-01-05 14:26:16 -08:00
Brian Behlendorf a94bfe5a2d Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 14:13:55 -08:00
Brian Behlendorf 743a2a757f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 14:13:54 -08:00
Brian Behlendorf d8f9597730 Always include u8_textprep 2009-01-05 14:12:03 -08:00
Brian Behlendorf 2dddcca89a Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 13:59:10 -08:00
Brian Behlendorf 4e41051097 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 13:59:09 -08:00
Brian Behlendorf 0c9de0c356 Linux kernel modularize unicode 2009-01-05 13:57:26 -08:00
Brian Behlendorf 1751caa615 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 12:40:38 -08:00
Brian Behlendorf 5d49f45c50 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 12:40:37 -08:00
Brian Behlendorf 9c2bf69ecb Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 12:40:25 -08:00
Brian Behlendorf ce7115b807 Add unicode makefile references and support 2009-01-05 12:33:09 -08:00
Brian Behlendorf ced77c2f1b Add unicode makefile references and support 2009-01-05 12:32:55 -08:00
Brian Behlendorf 61f28b82f0 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 12:11:00 -08:00
Brian Behlendorf dee2ae81f9 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 12:10:58 -08:00
Brian Behlendorf 1c1ec8cce6 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 12:10:37 -08:00
Brian Behlendorf 07c6176130 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-05 12:09:06 -08:00
Brian Behlendorf c239bd53d2 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-01-05 12:08:46 -08:00
Brian Behlendorf 674ed5bd02 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2009-01-05 12:08:18 -08:00
Brian Behlendorf 91daa17079 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-01-05 12:08:16 -08:00
Brian Behlendorf 39b3a6a12d Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-05 12:08:11 -08:00
Brian Behlendorf a22f3a712d Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2009-01-05 12:07:58 -08:00
Brian Behlendorf d09ef994e7 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-01-05 12:07:48 -08:00
Brian Behlendorf 5a7a00f67c Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-01-05 12:07:30 -08:00
Brian Behlendorf 7d4ccef58f Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-05 12:07:27 -08:00
Brian Behlendorf cdfd10ba79 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-01-05 12:07:25 -08:00
Brian Behlendorf 42bcb36c89 Add unicode library 2009-01-05 12:03:23 -08:00
Brian Behlendorf 0a963fa1b8 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 13:49:54 -08:00
Brian Behlendorf 6b88c17a8f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 13:49:54 -08:00
Brian Behlendorf 39953e7eb3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 13:49:47 -08:00
Brian Behlendorf ffb8773241 Take out page map functions for now 2008-12-23 13:47:22 -08:00
Brian Behlendorf de6b729e33 Add Makefile tweak 2008-12-23 13:44:15 -08:00
Brian Behlendorf 4177b4715d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 13:13:37 -08:00
Brian Behlendorf 642a64b7bd Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 13:13:37 -08:00
Brian Behlendorf f49886c003 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 13:13:29 -08:00
Brian Behlendorf 7725fe7431 Remove CPU_SEQID from context, available in SPL. Additionally add module magic for zcommon 2008-12-23 13:11:03 -08:00
Brian Behlendorf e7e0111a7c Update makefile 2008-12-23 13:07:27 -08:00
Brian Behlendorf b4c584906e Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 12:51:07 -08:00
Brian Behlendorf 9b3e361b6e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 12:51:06 -08:00
Brian Behlendorf c22ff325ce Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 12:50:58 -08:00
Brian Behlendorf 0dfd5ebee8 module/zcommon/Makefile.in 2008-12-23 12:47:03 -08:00
Brian Behlendorf 1431c8e452 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 11:50:06 -08:00
Brian Behlendorf 8209bef3af Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 11:50:05 -08:00
Brian Behlendorf 82cd3659a2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 11:49:58 -08:00
Brian Behlendorf 5a0a9cc451 Update makefiles 2008-12-23 11:47:33 -08:00
Brian Behlendorf 8f69262e09 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 13:52:06 -08:00
Brian Behlendorf c93aec7f64 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 13:52:05 -08:00
Brian Behlendorf 1f72057409 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 13:51:57 -08:00
Brian Behlendorf 90e5216ea9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 13:51:17 -08:00
Brian Behlendorf 3b93dc4d82 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 13:51:14 -08:00
Brian Behlendorf 3a953fa870 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-22 13:51:13 -08:00
Brian Behlendorf d684390d3a Just fix a bogus return type 2008-12-22 13:49:15 -08:00
Brian Behlendorf a9058c38b3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 13:35:07 -08:00
Brian Behlendorf 9bfe4e627a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 13:35:06 -08:00
Brian Behlendorf 46badfb03b Only allow this for the kernel 2008-12-22 13:33:06 -08:00
Brian Behlendorf b49ce65660 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 11:41:35 -08:00
Brian Behlendorf fa9a05e496 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 11:41:35 -08:00
Brian Behlendorf 187be3051e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 11:41:27 -08:00
Brian Behlendorf 7047bb0678 Add missing files from Makefile.am 2008-12-22 11:36:48 -08:00
Brian Behlendorf 72f9288f09 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 11:08:24 -08:00
Brian Behlendorf d51e1b0eeb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 11:08:23 -08:00
Brian Behlendorf 09de417e20 Move #endif up to expose userspace bits 2008-12-22 11:01:35 -08:00
Brian Behlendorf ba2c349faf Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 10:36:56 -08:00
Brian Behlendorf e0141c82aa Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 10:36:55 -08:00
Brian Behlendorf bdbd91fe46 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 10:36:48 -08:00
Brian Behlendorf 10911f9d71 Add missing sources 2008-12-22 10:27:41 -08:00
Brian Behlendorf 07bc9c667e Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 16:34:28 -08:00
Brian Behlendorf f7b6b1c5c1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 16:34:27 -08:00
Brian Behlendorf cbc70456f1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 16:34:10 -08:00
Brian Behlendorf 96813619bf Pull in new background scrubber 2008-12-19 16:29:13 -08:00
Brian Behlendorf f935667824 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 13:48:01 -08:00
Brian Behlendorf 5ae92c2a3c Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 13:48:00 -08:00
Brian Behlendorf 5cd3d5fe3f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 13:47:53 -08:00
Brian Behlendorf 1b2a1a31bb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 13:47:20 -08:00
Brian Behlendorf b5e4bf3731 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 13:47:19 -08:00
Brian Behlendorf 8161b781a1 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 13:47:18 -08:00
Brian Behlendorf 89bd2100e7 Resolve a few more c90 issues 2008-12-19 13:45:24 -08:00
Brian Behlendorf d6bcad3544 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 12:38:40 -08:00
Brian Behlendorf f53179120a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 12:38:39 -08:00
Brian Behlendorf 5f5a7707b5 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 12:38:25 -08:00
Brian Behlendorf 97818e5e2b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 12:37:17 -08:00
Brian Behlendorf 459f1388ba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 12:37:15 -08:00
Brian Behlendorf 87810a7c8b Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 12:37:13 -08:00
Brian Behlendorf 93a6c0b0b9 Fix c90 for() issue 2008-12-19 12:33:22 -08:00
Brian Behlendorf d5b0e2f5f8 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 11:06:33 -08:00
Brian Behlendorf f9e908db67 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 11:06:32 -08:00
Brian Behlendorf e5a6ed971b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 11:06:25 -08:00
Brian Behlendorf cc92d6497b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 11:05:49 -08:00
Brian Behlendorf d67cf69e08 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 11:05:49 -08:00
Brian Behlendorf 893a49fa9a Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 11:05:48 -08:00
Brian Behlendorf 9041f66bad Fix all instances of for (int i;;) {} that were easily found 2008-12-19 11:03:54 -08:00
Brian Behlendorf 38712a11db Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 10:50:50 -08:00
Brian Behlendorf 25585a1884 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 10:50:49 -08:00
Brian Behlendorf 4f5a560334 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 10:50:42 -08:00
Brian Behlendorf 1db27e736e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 10:50:09 -08:00
Brian Behlendorf ead0ea6da5 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:50:09 -08:00
Brian Behlendorf d9b08ad01f Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 10:50:08 -08:00
Brian Behlendorf 66e0d59024 Whoops, add missing j 2008-12-19 10:48:11 -08:00
Brian Behlendorf 7532b57352 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 10:37:14 -08:00