c8d75a1c9d
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-06-14 15:37:00 -07:00
d9f910d423
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-06-14 15:36:59 -07:00
993fa8c15c
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-06-14 15:36:59 -07:00
2c95012288
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-06-14 15:36:59 -07:00
3135b5a26a
Update gcc-c90 minor updates
...
Originally these changes were on other gcc-* topic branches but
because c90 touches the same bit of code and I'd like to keep all
the gcc-* branches completely parallel I've moved these few bits
over here. This is one of the downsides of not just having one
big patch stack.
2010-06-14 15:32:54 -07:00
b41463f5e8
Update gcc-invalid-prototypes
...
Fix new invalid prototypes, typically just a missing void arg.
2010-06-14 15:25:49 -07:00
0a8593375e
Update gcc-missing-case
...
Fix new locations of an incomplete case statement.
2010-06-14 15:19:09 -07:00
1893aa76ec
Update gcc-no-parenthesis
...
Fix new locations of missing parenthesis according to gcc.
2010-06-14 15:16:41 -07:00
48bd88f014
Update gcc-c90
...
Additional c90 fixes required due to ZFS update, these include fixing new
places c99 specific things have been done and some cleanup of old usage.
2010-06-14 15:15:26 -07:00
fc490c18b6
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-06-14 14:42:56 -07:00
dd8f6da3da
Update gcc-cast
...
Fix new instances of missing casts or assumed types.
2010-06-14 14:40:10 -07:00
ffaa677995
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/dbuf.c
module/zfs/dsl_dataset.c
2010-05-28 15:38:43 -07:00
3e2be634a5
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb.c
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zfs/zfs_util.h
cmd/zinject/zinject.h
cmd/zpool/zpool_main.c
cmd/zpool/zpool_util.c
cmd/ztest/ztest.c
lib/libnvpair/include/libnvpair.h
lib/libnvpair/libnvpair.c
lib/libzfs/libzfs_changelist.c
lib/libzfs/libzfs_config.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
module/avl/avl.c
module/avl/include/sys/avl.h
module/nvpair/include/sys/nvpair.h
module/nvpair/nvpair.c
module/zcommon/include/zfs_comutil.h
module/zcommon/include/zfs_prop.h
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dmu_zfetch.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/dsl_synctask.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/dmu_zfetch.h
module/zfs/include/sys/dsl_synctask.h
module/zfs/include/sys/refcount.h
module/zfs/include/sys/txg.h
module/zfs/include/sys/uberblock.h
module/zfs/include/sys/zap_leaf.h
module/zfs/include/sys/zfs_debug.h
module/zfs/include/sys/zfs_znode.h
module/zfs/include/sys/zio_compress.h
module/zfs/include/sys/zvol.h
module/zfs/lzjb.c
module/zfs/metaslab.c
module/zfs/refcount.c
module/zfs/sha256.c
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/uberblock.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_replay.c
module/zfs/zio.c
module/zfs/zio_compress.c
2010-05-28 15:34:57 -07:00
d60fc5ca30
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
...
Conflicts:
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_prop.c
module/zfs/metaslab.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
2010-05-28 15:07:36 -07:00
28e07224db
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/dmu_objset.c
module/zfs/dsl_dataset.c
module/zfs/dsl_pool.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c
module/zfs/zio.c
2010-05-28 14:54:33 -07:00
abfb2a3e1d
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
...
Conflicts:
lib/libzfs/libzfs_changelist.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c
2010-05-28 14:49:40 -07:00
2591cac812
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
...
Conflicts:
cmd/zdb/zdb_il.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_mount.c
2010-05-28 14:42:40 -07:00
475bf41d1c
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
...
Conflicts:
cmd/zfs/zfs_main.c
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c
2010-05-28 14:36:18 -07:00
957b7b41d4
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
module/zfs/dbuf.c
module/zfs/dsl_dataset.c
module/zfs/dsl_scrub.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zio.c
2010-05-28 14:19:22 -07:00
428870ff73
Update core ZFS code from build 121 to build 141.
2010-05-28 13:45:14 -07:00
c91169c7c5
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
...
Conflicts:
lib/libzfs/libzfs_util.c
2010-05-28 12:42:27 -07:00
fb72c6ef81
Revert gcc-shadow using -Wno-shadow I can live with
...
While I would rather fix all the instances where something is shadowed
it complicates tracking the OpenSolaris code where they either don't
seem to care or have different conflicts. Anyway, this ends up being
more simply gratutous change than I care for.
2010-05-28 12:34:45 -07:00
354bebb795
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-04-29 12:31:59 -07:00
f26fce7b17
Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c
2010-04-29 12:23:12 -07:00
ff1883382e
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-04-29 12:03:50 -07:00
6edb312559
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-04-29 12:03:45 -07:00
3b12e5a66a
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-04-29 12:03:42 -07:00
75d373f38d
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-04-29 12:03:36 -07:00
f90ac4206e
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-04-29 12:03:32 -07:00
e366632a94
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-04-29 12:03:29 -07:00
b3b5351af0
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-04-29 12:03:20 -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
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
d91c81c4df
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-04-29 10:41:09 -07:00
a3c2fb2333
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-04-29 10:41:02 -07:00
3bd5ecf4a7
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-04-29 10:41:00 -07:00
c3da525f25
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-04-29 10:40:54 -07:00
1655c9c76f
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-04-29 10:40:51 -07:00
097e1158e6
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-04-29 10:40:48 -07:00
d5dbdb4fe2
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-04-29 10:40:38 -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
e6f83f6a79
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-01-08 11:39:11 -08:00
cdbe3032eb
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-01-08 11:39:09 -08:00
adb3a3deec
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-01-08 11:39:08 -08:00
d48b3a8869
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-01-08 11:39:06 -08:00
Brian Behlendorf