f4295781e2
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-04-29 12:05:32 -07:00
be442baea7
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-04-29 12:05:23 -07:00
47026cc874
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-04-29 12:05:15 -07:00
886cee417f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-04-29 12:05:14 -07:00
9fa021c2c1
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-04-29 12:04:45 -07:00
fa60ee8c86
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-04-29 12:04:39 -07:00
66ba722b0a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 12:04:36 -07:00
f3017eccb7
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-04-29 12:04:33 -07:00
7a062682fb
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-04-29 12:04:32 -07:00
9c10b70375
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-04-29 12:04:31 -07:00
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
e7edc55fff
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-04-29 12:03:58 -07:00
ff1883382e
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-04-29 12:03:50 -07:00
8279f80885
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-04-29 12:03:18 -07:00
c708851b13
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-04-29 12:03:17 -07:00
3affbe6d7e
Update nvpair's to include nv_alloc_fixed support
2010-04-29 11:59:41 -07:00
aebb002361
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-04-29 11:02:09 -07:00
bf68847fd6
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-04-29 11:01:39 -07:00
e46d019df6
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-04-29 11:01:31 -07:00
208e42ffe6
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-04-29 11:01:23 -07:00
ea12ca13bf
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-04-29 11:01:22 -07:00
b98d7711a6
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-04-29 11:00:54 -07:00
76d877a211
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-04-29 11:00:49 -07:00
c9ae4b9808
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 11:00:46 -07:00
8535236dca
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-04-29 11:00:45 -07:00
72de3a8ee1
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-04-29 11:00:44 -07:00
151f424dd8
Strip ident pragma from module/zfs/include/sys/fm/util.h
2010-04-29 10:57:17 -07:00
4d5d0f9ef5
Include FMA source and headers in build system
2010-04-29 10:55:27 -07:00
50cf137f41
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-04-29 10:43:27 -07:00
4fde8f52f1
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-04-29 10:42:55 -07:00
9c9f3480ad
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-04-29 10:42:47 -07:00
25aa7e01e3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-04-29 10:42:40 -07:00
86705eb3e0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-04-29 10:42:39 -07:00
9c2946732d
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-04-29 10:42:09 -07:00
91b582d4a1
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-04-29 10:42:02 -07:00
1368594e11
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 10:41:59 -07:00
ca4ad9f284
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-04-29 10:41:56 -07:00
9199dc112a
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-04-29 10:41:55 -07:00
c97d2c5541
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-04-29 10:41:53 -07:00
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
34d62da9bc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-04-29 10:41:18 -07:00
d91c81c4df
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-04-29 10:41:09 -07:00
8c24800b72
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-04-29 10:40:36 -07:00
4aad8d3244
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-04-29 10:40:34 -07:00
fa42225a3d
Add Solaris FMA style support
2010-04-29 10:37:15 -07:00
a608242d71
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-22 16:56:41 -07:00
1a6447c024
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-22 16:56:32 -07:00
38b6b00574
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-22 16:56:30 -07:00
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
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
f04c01c945
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-09 13:53:21 -08:00
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
4198550b18
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-09 13:25:42 -08:00
e5fd6fb97f
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-09 13:25:16 -08:00
f134f893c1
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-09 13:25:09 -08:00
c0485b7731
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-09 13:25:02 -08:00
759c1e4f99
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-09 13:25:02 -08:00
89f4f4a695
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-09 13:24:37 -08:00
6c0502f5a6
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-09 13:24:32 -08:00
19eef8ad39
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-09 13:24:30 -08:00
9fa502c50b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-03-09 13:24:29 -08:00
e218fd13e8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-09 13:24:28 -08:00
ef359aee66
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-09 13:24:27 -08:00
f2ab1fea36
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-09 13:24:27 -08:00
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
3ea63f0cdb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-09 12:31:25 -08:00
eda82c813d
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-09 12:30:57 -08:00
3ea409cfce
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-09 12:30:50 -08:00
feac56bf5a
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-09 12:30:44 -08:00
17a96f44f3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-09 12:30:43 -08:00
573328741b
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-09 12:30:21 -08:00
324bb92af5
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-09 12:30:19 -08:00
8f63d438cd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-09 12:30:18 -08:00
48e74ed68b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-03-09 12:30:03 -08:00
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
49f514aabb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-09 10:31:33 -08:00
4d0e16b4a8
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-09 10:31:05 -08:00
4aec8c8fe5
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-09 10:30:58 -08:00
0d3d0d9497
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-09 10:30:51 -08:00
bbb9ce3401
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-09 10:30:50 -08:00
f3aec3d1eb
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-09 10:30:26 -08:00
e760d8d950
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-09 10:30:21 -08:00
3a9850385c
Include all headers regardless of depth
...
The previous hack for this was to move headers 3 levels deep in to
the top level include dir and headers 4 levels deep in to sys.
Obviously this was fairly limiting and missed two important headers.
./zfs/include/sys/fm/fs/zfs.h
./zfs/include/sys/fs/zfs.h
This patch updates the code to be smarter and installs all the headers
to the correct location regardless of depth. Each header will have its
leading 3 path args stripped (i.e. ./zfs/include/) and replaced with
the correct install destination. All path information past the first
three levels will be preserved.
2010-03-09 10:20:34 -08:00
16cc96a13f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-08 13:48:38 -08:00
aed42f2444
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-08 13:48:23 -08:00
b87bc94fb0
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-08 13:48:19 -08:00
7be37fe5f3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-08 13:48:16 -08:00
9974a98a5d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-08 13:48:15 -08:00
5f51cdd50a
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-08 13:48:02 -08:00
6dffc18479
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-08 13:47:59 -08:00
3d7cfde000
Remove Module.markers and Module.symver{s} in clean target
...
Split 'modules' and 'clean' Makefile targets to allow us to
cleanly remove the Module.* build products with a 'make clean'.
2010-03-08 13:45:51 -08:00
ed3451bd03
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-08 10:51:47 -08:00
5f863d5936
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-08 10:51:39 -08:00
df688225a3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-08 10:51:37 -08:00
4dbd1e59e5
Configure checks for kernel build options incompatible with the license
...
Changes for linux-kernel-disk topic branch, see commit fd75782
2010-03-08 10:47:55 -08:00
7121867aea
Configure checks for kernel build options incompatible with the license
...
Changes for linux-kernel-module topic branch, see commit fd75782
2010-03-08 10:45:19 -08:00
efc3e7a375
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-01-08 11:40:18 -08:00
6037f5f124
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-01-08 11:40:01 -08:00
e4a4e686cd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-01-08 11:39:56 -08:00
237341f2ce
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-01-08 11:39:52 -08:00
Brian Behlendorf
Ricardo M. Correia