Commit Graph

2235 Commits

Author SHA1 Message Date
Brian Behlendorf d4fcfa8cd6 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-04-29 12:32:57 -07:00
Brian Behlendorf 7d37312f6c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-04-29 12:32:49 -07:00
Brian Behlendorf 0bf57f091f Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2010-04-29 12:32:43 -07:00
Brian Behlendorf 0eff4db8b4 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-04-29 12:32:41 -07:00
Brian Behlendorf 756a371a3f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-04-29 12:32:40 -07:00
Brian Behlendorf 2e161f3b31 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-04-29 12:32:10 -07:00
Brian Behlendorf a3b3d2b059 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-04-29 12:32:04 -07:00
Brian Behlendorf 98660aec20 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-04-29 12:32:01 -07:00
Brian Behlendorf aa4a91aef5 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-04-29 12:32:00 -07:00
Brian Behlendorf 354bebb795 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2010-04-29 12:31:59 -07:00
Brian Behlendorf 89154c98f9 Update build system to include nvpair_alloc_fixed.c. 2010-04-29 12:24:25 -07:00
Brian Behlendorf f26fce7b17 Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c 2010-04-29 12:23:12 -07:00
Brian Behlendorf f1a28f535c Export required nv_alloc_fixed symbols. 2010-04-29 12:21:24 -07:00
Brian Behlendorf 9dc83e5f34 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-04-29 12:06:04 -07:00
Brian Behlendorf f4295781e2 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-04-29 12:05:32 -07:00
Brian Behlendorf be442baea7 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-04-29 12:05:23 -07:00
Brian Behlendorf 47026cc874 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-04-29 12:05:15 -07:00
Brian Behlendorf 886cee417f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-04-29 12:05:14 -07:00
Brian Behlendorf 9fa021c2c1 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-04-29 12:04:45 -07:00
Brian Behlendorf fa60ee8c86 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-04-29 12:04:39 -07:00
Brian Behlendorf 66ba722b0a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-04-29 12:04:36 -07:00
Brian Behlendorf f3017eccb7 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-04-29 12:04:33 -07:00
Brian Behlendorf 7a062682fb Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2010-04-29 12:04:32 -07:00
Brian Behlendorf 9c10b70375 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2010-04-29 12:04:31 -07:00
Brian Behlendorf 9d8e4f07ff Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2010-04-29 12:04:30 -07:00
Brian Behlendorf cf4e5324e9 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2010-04-29 12:04:18 -07:00
Brian Behlendorf 8273e838de Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2010-04-29 12:04:03 -07:00
Brian Behlendorf 78559a049a Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2010-04-29 12:04:02 -07:00
Brian Behlendorf e7edc55fff Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-04-29 12:03:58 -07:00
Brian Behlendorf ff1883382e Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2010-04-29 12:03:50 -07:00
Brian Behlendorf 8279f80885 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-04-29 12:03:18 -07:00
Brian Behlendorf c708851b13 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2010-04-29 12:03:17 -07:00
Brian Behlendorf 3affbe6d7e Update nvpair's to include nv_alloc_fixed support 2010-04-29 11:59:41 -07:00
Brian Behlendorf aebb002361 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-04-29 11:02:09 -07:00
Brian Behlendorf bf68847fd6 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-04-29 11:01:39 -07:00
Brian Behlendorf e46d019df6 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-04-29 11:01:31 -07:00
Brian Behlendorf 208e42ffe6 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-04-29 11:01:23 -07:00
Brian Behlendorf ea12ca13bf Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-04-29 11:01:22 -07:00
Brian Behlendorf b98d7711a6 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-04-29 11:00:54 -07:00
Brian Behlendorf 76d877a211 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-04-29 11:00:49 -07:00
Brian Behlendorf c9ae4b9808 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-04-29 11:00:46 -07:00
Brian Behlendorf 8535236dca Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-04-29 11:00:45 -07:00
Brian Behlendorf 72de3a8ee1 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2010-04-29 11:00:44 -07:00
Brian Behlendorf 151f424dd8 Strip ident pragma from module/zfs/include/sys/fm/util.h 2010-04-29 10:57:17 -07:00
Brian Behlendorf 4d5d0f9ef5 Include FMA source and headers in build system 2010-04-29 10:55:27 -07:00
Brian Behlendorf 50cf137f41 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-04-29 10:43:27 -07:00
Brian Behlendorf 4fde8f52f1 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-04-29 10:42:55 -07:00
Brian Behlendorf 9c9f3480ad Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-04-29 10:42:47 -07:00
Brian Behlendorf 25aa7e01e3 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-04-29 10:42:40 -07:00
Brian Behlendorf 86705eb3e0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-04-29 10:42:39 -07:00
Brian Behlendorf 9c2946732d Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-04-29 10:42:09 -07:00
Brian Behlendorf 91b582d4a1 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-04-29 10:42:02 -07:00
Brian Behlendorf 1368594e11 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-04-29 10:41:59 -07:00
Brian Behlendorf ca4ad9f284 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-04-29 10:41:56 -07:00
Brian Behlendorf 9199dc112a Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2010-04-29 10:41:55 -07:00
Brian Behlendorf c97d2c5541 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2010-04-29 10:41:53 -07:00
Brian Behlendorf 18f485a504 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2010-04-29 10:41:52 -07:00
Brian Behlendorf 655b4b2b1c Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2010-04-29 10:41:39 -07:00
Brian Behlendorf 13668b7879 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2010-04-29 10:41:23 -07:00
Brian Behlendorf f2ca1d7334 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2010-04-29 10:41:22 -07:00
Brian Behlendorf 34d62da9bc Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-04-29 10:41:18 -07:00
Brian Behlendorf d91c81c4df Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2010-04-29 10:41:09 -07:00
Brian Behlendorf 8c24800b72 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-04-29 10:40:36 -07:00
Brian Behlendorf 4aad8d3244 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2010-04-29 10:40:34 -07:00
Brian Behlendorf fa42225a3d Add Solaris FMA style support 2010-04-29 10:37:15 -07:00
Brian Behlendorf a608242d71 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-03-22 16:56:41 -07:00
Brian Behlendorf 1a6447c024 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2010-03-22 16:56:32 -07:00
Brian Behlendorf 38b6b00574 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-22 16:56:30 -07:00
Brian Behlendorf 5b14d2ab2f Move zfs_config.h include to command line -include
Remove the few places in the code where zfs_config.h is included.
It is now added to the gcc compile line to ensure the config results
2010-03-22 16:50:58 -07:00
Brian Behlendorf c9aaaff23b Move zfs_config.h include to command line -include
Remove the few places in the code where zfs_config.h is included.
It is now added to the gcc compile line to ensure the config results
are always available.
2010-03-22 16:48:16 -07:00
Brian Behlendorf f04c01c945 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-03-09 13:53:21 -08:00
Ricardo M. Correia ba0a56bb2a Fix struct ht_lock padding in arc.c.
This was leading to a compilation error because in Linux, sizeof
(kmutex_t) can be larger than 64 in some circumstances (e.g. with
debugging and lockdep enabled).

The code was previously fixed to align the structure to 256 bytes,
but a better fix is to align it to the next multiple of 64 bytes.
2010-03-09 13:49:36 -08:00
Brian Behlendorf 4198550b18 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-03-09 13:25:42 -08:00
Brian Behlendorf e5fd6fb97f Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-03-09 13:25:16 -08:00
Brian Behlendorf f134f893c1 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-03-09 13:25:09 -08:00
Brian Behlendorf c0485b7731 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-09 13:25:02 -08:00
Brian Behlendorf 759c1e4f99 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-03-09 13:25:02 -08:00
Brian Behlendorf 89f4f4a695 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-03-09 13:24:37 -08:00
Brian Behlendorf 6c0502f5a6 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-09 13:24:32 -08:00
Brian Behlendorf 19eef8ad39 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-03-09 13:24:30 -08:00
Brian Behlendorf 9fa502c50b Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-03-09 13:24:29 -08:00
Brian Behlendorf e218fd13e8 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-03-09 13:24:28 -08:00
Brian Behlendorf ef359aee66 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-03-09 13:24:27 -08:00
Brian Behlendorf f2ab1fea36 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-03-09 13:24:27 -08:00
Ricardo M. Correia 2b85024275 Use CPU percentages for number of commit cb threads.
This doesn't change number of threads in the kernel, but it reduces number of
threads in ztest (important due to 32-bit address limitations).
2010-03-09 13:21:20 -08:00
Brian Behlendorf 3ea63f0cdb Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-03-09 12:31:25 -08:00
Brian Behlendorf eda82c813d Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-03-09 12:30:57 -08:00
Brian Behlendorf 3ea409cfce Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-03-09 12:30:50 -08:00
Brian Behlendorf feac56bf5a Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-09 12:30:44 -08:00
Brian Behlendorf 17a96f44f3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-03-09 12:30:43 -08:00
Brian Behlendorf 573328741b Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2010-03-09 12:30:21 -08:00
Brian Behlendorf 324bb92af5 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-03-09 12:30:19 -08:00
Brian Behlendorf 8f63d438cd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-03-09 12:30:18 -08:00
Brian Behlendorf 48e74ed68b Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:

	cmd/ztest/ztest.c
2010-03-09 12:30:03 -08:00
Brian Behlendorf 9a3d5378c6 Clean up emulation of kernel threads in userspace.
Updated to use pthread thread specific data rather than keeping
a global list.  This also fixes at least one easily reproducible
crash in ztest
2010-03-09 12:25:28 -08:00
Brian Behlendorf 49f514aabb Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-03-09 10:31:33 -08:00
Brian Behlendorf 4d0e16b4a8 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-03-09 10:31:05 -08:00
Brian Behlendorf 4aec8c8fe5 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-03-09 10:30:58 -08:00
Brian Behlendorf 0d3d0d9497 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-09 10:30:51 -08:00
Brian Behlendorf bbb9ce3401 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-03-09 10:30:50 -08:00