Merge commit 'refs/top-bases/gcc-c90' into gcc-c90

diff --cc cmd/zdb/zdb.c
Simple merge

diff --cc cmd/zfs/zfs_main.c
Simple merge

diff --cc cmd/ztest/ztest.c
Simple merge

diff --cc module/zfs/arc.c
Simple merge

diff --cc module/zfs/dsl_dataset.c
Simple merge

diff --cc module/zfs/metaslab.c
Simple merge

diff --cc module/zfs/spa.c
index e7b6694bebf7ea1248348be44ed2ba9fe55837a3,ef04b7c9431388318b5b3350fba32919567b9114..b6a1de288d4e012e999ca925d578a575d08a5a2a
--- 1/module/zfs/spa.c
--- 2/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@@ -486,10 -486,8 +486,10 @@@ spa_get_errlists(spa_t *spa, avl_tree_
   * Activate an uninitialized pool.
   */
  static void
- spa_activate(spa_t *spa)
+ spa_activate(spa_t *spa, int mode)
  {
 +      int t, q;
 +
        ASSERT(spa->spa_state == POOL_STATE_UNINITIALIZED);
  
        spa->spa_state = POOL_STATE_ACTIVE;

diff --cc module/zfs/spa_misc.c
Simple merge

diff --cc module/zfs/vdev.c
Simple merge

diff --cc module/zfs/vdev_label.c
Simple merge

diff --cc module/zfs/vdev_mirror.c
Simple merge

diff --cc module/zfs/vdev_queue.c
Simple merge

diff --cc module/zfs/vdev_raidz.c
Simple merge

diff --cc module/zfs/zio.c
Simple merge