Brian Behlendorf
9d8767dfb2
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-03-09 14:19:04 -08:00
Brian Behlendorf
4d306e2583
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-03-09 14:19:03 -08:00
Brian Behlendorf
c09ab40097
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-03-09 14:19:02 -08:00
Brian Behlendorf
bd81c6a5d0
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-03-09 14:19:00 -08:00
Brian Behlendorf
d01019d8a3
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-03-09 14:18:58 -08:00
Brian Behlendorf
ddf8afb06b
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-03-09 14:18:57 -08:00
Brian Behlendorf
49ea943914
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-03-09 14:18:56 -08:00
Brian Behlendorf
c60984f102
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-03-09 14:18:54 -08:00
Brian Behlendorf
774f7c02b1
Ignore unsigned module build products
...
Along with the addition of signed kernel modules in newer kernel
we have a few new build products we need to ignore. LKLM has the
whole thread for those interested: http://lkml.org/lkml/2007/2/14/164
2010-03-09 14:14:09 -08: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
6521b99461
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-09 13:43:29 -08:00
Ricardo M. Correia
f1c8b3a435
Fix duplicate uuid_t typedef.
...
This typedef is being done in both lib/libefi/include/sys/uuid.h and
/usr/include/uuid/uuid.h, both of which are included in lib/libefi/rdwr_efi.c.
This leads to the following error:
In file included from ../../lib/libefi/include/sys/efi_partition.h:29,
from ../../lib/libefi/rdwr_efi.c:41:
../../lib/libefi/include/sys/uuid.h:81: error: redefinition of typedef 'uuid_t'
/usr/include/uuid/uuid.h:19: note: previous declaration of 'uuid_t' was here
The reason that we didn't see this before, is because of a strange feature in
gcc where some types of warnings/errors are silently ignored if they come from
system headers. But depending on the order of how system headers end up
included, libefi's uuid.h may actually be included after uuid/uuid.h, which
leads to the error above.
It is safe to remove this duplicate typedef because we are already
dependent on the linux uuid.h header and it's exceptionally unlikely
they will ever change the size.
2010-03-09 13:38:55 -08:00
Brian Behlendorf
69a206fcee
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-09 13:26:10 -08:00
Brian Behlendorf
b39822ed60
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-09 13:26:08 -08:00
Brian Behlendorf
aef23651c3
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-09 13:26:04 -08:00
Brian Behlendorf
ee9da2efac
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-09 13:26:02 -08:00
Brian Behlendorf
e1f8751cb7
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:58 -08:00
Brian Behlendorf
6faf89731e
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-09 13:25:55 -08:00
Brian Behlendorf
044b499b43
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:51 -08:00
Brian Behlendorf
05b567c0ef
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-09 13:25:49 -08:00
Brian Behlendorf
bcf862f554
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:44 -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
9053da0d04
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:38 -08:00
Brian Behlendorf
26b2ec2cd9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-09 13:25:36 -08:00
Brian Behlendorf
5490798730
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:31 -08:00
Brian Behlendorf
13d740f8fa
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-09 13:25:29 -08:00
Brian Behlendorf
5b17af096c
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:24 -08:00
Brian Behlendorf
4ad660910b
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-09 13:25:22 -08:00
Brian Behlendorf
f3129fc3cd
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:18 -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
a7e4cfc3be
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:11 -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
7c2efbfd28
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:04 -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
99f1e547b1
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-09 13:24:53 -08:00
Brian Behlendorf
36fd3fc49c
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-09 13:24:52 -08:00
Brian Behlendorf
1ea8689197
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-03-09 13:24:47 -08:00
Brian Behlendorf
2948b21db2
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-09 13:24:45 -08:00
Brian Behlendorf
a3543de894
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-09 13:24:39 -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
dcb30ec329
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-03-09 13:24:30 -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