dcabd1a0c6
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-23 11:43:29 -07:00
158a465240
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-23 11:43:27 -07:00
bca0b40198
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-23 11:43:21 -07:00
0408af1eb1
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-23 11:43:20 -07:00
e0549da1d9
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-23 11:43:14 -07:00
a602feecbb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-23 11:43:12 -07:00
63266fb77f
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-23 11:43:06 -07:00
f920386365
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-23 11:43:04 -07:00
d4e662c493
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-23 11:42:58 -07:00
6f120e4b4f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-23 11:42:56 -07:00
3a041de01f
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-23 11:42:51 -07:00
fd7a0e109c
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-23 11:42:48 -07:00
cb432832d3
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-23 11:42:43 -07:00
79bf615660
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-23 11:42:41 -07:00
4a2d053c39
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-23 11:42:34 -07:00
f4ca8d1a41
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-23 11:42:32 -07:00
2deb475123
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-23 11:42:26 -07:00
6e615d3108
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-23 11:42:24 -07:00
758275af4f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-07-23 11:42:23 -07:00
2eee7b0ee5
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-07-23 11:42:22 -07:00
d43294230a
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-07-23 11:42:21 -07:00
4471454be8
Merge branch 'fix-stack-ztest' into refs/top-bases/fix-branch
2010-07-23 11:42:21 -07:00
085c18fa55
Merge commit 'refs/top-bases/fix-stack-ztest' into fix-stack-ztest
2010-07-23 11:42:20 -07:00
be92edb218
Add extra guard space if needed
...
Some buggy NPTL threading implementations include the guard area within
the stack size allocations. In this case we need to allocate an extra
page to account for the guard area since we only have two pages of usable
stack on Linux. Added an autoconf test that detects such implementations
by running a test program designed to segfault if the bug is present.
Set a flag NPTL_GUARD_WITHIN_STACK that is tested to decide if extra
stack space must be allocated for the guard area.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2010-07-23 11:38:00 -07:00
16a9f68137
Autoconf check for buggy stack guard region
...
Some buggy NPTL threading implementations include the guard area within
the stack size allocations. In this case we need to allocate an extra
page to account for the guard area since we only have two pages of usable
stack on Linux. Added an autoconf test that detects such implementations
by running a test program designed to segfault if the bug is present.
Set a flag NPTL_GUARD_WITHIN_STACK that is tested to decide if extra
stack space must be allocated for the guard area.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2010-07-23 11:35:20 -07:00
987860ccd4
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-07-23 10:46:23 -07:00
52f6982c14
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-07-23 10:46:21 -07:00
88a24747a2
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-23 10:46:16 -07:00
b8d5859f61
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-23 10:46:12 -07:00
6308bddc55
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-23 10:46:06 -07:00
27b293a274
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-23 10:46:04 -07:00
e2050b7017
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-23 10:45:58 -07:00
07ff81417b
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-23 10:45:56 -07:00
bfb82b6dcb
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-23 10:45:50 -07:00
fc6e501036
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-23 10:45:48 -07:00
f46d2d4f79
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-23 10:45:42 -07:00
e1a29e4329
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-23 10:45:40 -07:00
524312c5af
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-23 10:45:35 -07:00
9700b0c5c7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-23 10:45:33 -07:00
8a7d4b07d5
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-23 10:45:27 -07:00
4d01b70fee
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-23 10:45:24 -07:00
8eb217e1b1
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-23 10:45:19 -07:00
3cd046b635
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-23 10:45:17 -07:00
d99bba47de
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-23 10:45:11 -07:00
31db1238c8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-23 10:45:09 -07:00
405815de45
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-23 10:45:03 -07:00
f6d7af69a4
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-23 10:45:01 -07:00
fd8be4cd39
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-23 10:44:55 -07:00
fe76ce50f8
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-23 10:44:53 -07:00
994782b6b6
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-23 10:44:46 -07:00
Brian Behlendorf
Ned Bass