Commit Graph

3292 Commits

Author SHA1 Message Date
Brian Behlendorf 651b0799e0 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-03-09 14:19:32 -08:00
Brian Behlendorf f048a6798d Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-03-09 14:19:32 -08:00
Brian Behlendorf 61b3d268ac Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch 2010-03-09 14:19:31 -08:00
Brian Behlendorf 46481bc85e Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source 2010-03-09 14:19:30 -08:00
Brian Behlendorf 94053b9a3d Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2010-03-09 14:19:29 -08:00
Brian Behlendorf 4b7bc4e96d Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 2010-03-09 14:19:28 -08:00
Brian Behlendorf ed83735903 Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2010-03-09 14:19:26 -08:00
Brian Behlendorf fd94e31370 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2010-03-09 14:19:26 -08:00
Brian Behlendorf 490f689b9c Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2010-03-09 14:19:24 -08:00
Brian Behlendorf d0ef2f8337 Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants 2010-03-09 14:19:23 -08:00
Brian Behlendorf 4a7b8629d5 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2010-03-09 14:19:21 -08:00
Brian Behlendorf dcd0eecf89 Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2010-03-09 14:19:20 -08:00
Brian Behlendorf 68e3c94270 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2010-03-09 14:19:18 -08:00
Brian Behlendorf bbdcc9ac52 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2010-03-09 14:19:17 -08:00
Brian Behlendorf 8310167805 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-03-09 14:19:16 -08:00
Brian Behlendorf 8e2b8a52f7 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2010-03-09 14:19:15 -08:00
Brian Behlendorf 9fc9e880ab Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2010-03-09 14:19:13 -08:00
Brian Behlendorf cc3e0e6b01 Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2010-03-09 14:19:12 -08:00
Brian Behlendorf ed15654feb Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2010-03-09 14:19:10 -08:00
Brian Behlendorf f3025c3875 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2010-03-09 14:19:09 -08:00
Brian Behlendorf 45b2e45354 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2010-03-09 14:19:07 -08:00
Brian Behlendorf 01dae884bc Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2010-03-09 14:19:06 -08:00
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
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 26b2ec2cd9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-09 13:25:36 -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 4b2b113239 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-09 12:31:18 -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 41516067cf Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-09 10:31:26 -08:00
Brian Behlendorf 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
Brian Behlendorf a32466bfde Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-08 16:24:19 -08:00
Brian J. Murrell 835a21a54a Fix definitions for the unknown distro/installation
If the distro/installation really is unsupported (i.e. unknown) we should
not make it look like a known distribution (i.e. RHEL) complete with
dependencies on other RPMs and trying to find kenrel source in the RH
standard location.
2010-03-08 16:20:20 -08:00
Brian Behlendorf 30ea25d8c6 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-08 16:08:45 -08:00
Brian J. Murrell 3f30f74414 Check for spl in ../spl if not found in install path
If the spl source could not be found in /usr/src/spl-*, also try to
find it in ../spl.  This makes finding it in a development sandbox
more natural.
2010-03-08 16:04:25 -08:00
Brian Behlendorf 7b42e72288 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-08 14:57:41 -08:00