Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

diff --combined drivers/infiniband/hw/mthca/mthca_cmd.c
index 9220473,378646b..49f211d
--- 1/drivers/infiniband/hw/mthca/mthca_cmd.c
--- 2/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@@ -1,7 -1,6 +1,7 @@@
  /*
   * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
   * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
 + * Copyright (c) 2005 Cisco Systems. All rights reserved.
   *
   * This software is available to you under a choice of one of two
   * licenses.  You may choose to be licensed under the terms of the GNU
@@@ -525,7 -524,7 +525,7 @@@ void mthca_cmd_use_polling(struct mthca
  }
  
  struct mthca_mailbox *mthca_alloc_mailbox(struct mthca_dev *dev,
-                                         unsigned int gfp_mask)
+                                         gfp_t gfp_mask)
  {
        struct mthca_mailbox *mailbox;
  
@@@ -707,13 -706,9 +707,13 @@@ int mthca_QUERY_FW(struct mthca_dev *de
  
        MTHCA_GET(lg, outbox, QUERY_FW_MAX_CMD_OFFSET);
        dev->cmd.max_cmds = 1 << lg;
 +      MTHCA_GET(dev->catas_err.addr, outbox, QUERY_FW_ERR_START_OFFSET);
 +      MTHCA_GET(dev->catas_err.size, outbox, QUERY_FW_ERR_SIZE_OFFSET);
  
        mthca_dbg(dev, "FW version %012llx, max commands %d\n",
                  (unsigned long long) dev->fw_ver, dev->cmd.max_cmds);
 +      mthca_dbg(dev, "Catastrophic error buffer at 0x%llx, size 0x%x\n",
 +                (unsigned long long) dev->catas_err.addr, dev->catas_err.size);
  
        if (mthca_is_memfree(dev)) {
                MTHCA_GET(dev->fw.arbel.fw_pages,       outbox, QUERY_FW_SIZE_OFFSET);
@@@ -938,9 -933,9 +938,9 @@@ int mthca_QUERY_DEV_LIM(struct mthca_de
                goto out;
  
        MTHCA_GET(field, outbox, QUERY_DEV_LIM_MAX_SRQ_SZ_OFFSET);
 -      dev_lim->max_srq_sz = 1 << field;
 +      dev_lim->max_srq_sz = (1 << field) - 1;
        MTHCA_GET(field, outbox, QUERY_DEV_LIM_MAX_QP_SZ_OFFSET);
 -      dev_lim->max_qp_sz = 1 << field;
 +      dev_lim->max_qp_sz = (1 << field) - 1;
        MTHCA_GET(field, outbox, QUERY_DEV_LIM_RSVD_QP_OFFSET);
        dev_lim->reserved_qps = 1 << (field & 0xf);
        MTHCA_GET(field, outbox, QUERY_DEV_LIM_MAX_QP_OFFSET);
@@@ -1050,8 -1045,6 +1050,8 @@@
                  dev_lim->max_pds, dev_lim->reserved_pds, dev_lim->reserved_uars);
        mthca_dbg(dev, "Max QP/MCG: %d, reserved MGMs: %d\n",
                  dev_lim->max_pds, dev_lim->reserved_mgms);
 +      mthca_dbg(dev, "Max CQEs: %d, max WQEs: %d, max SRQ WQEs: %d\n",
 +                dev_lim->max_cq_sz, dev_lim->max_qp_sz, dev_lim->max_srq_sz);
  
        mthca_dbg(dev, "Flags: %08x\n", dev_lim->flags);
  

diff --combined drivers/infiniband/hw/mthca/mthca_memfree.c
index d63b1a1,9ad8b3b..d72fe95
--- 1/drivers/infiniband/hw/mthca/mthca_memfree.c
--- 2/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
@@@ -82,7 -82,7 +82,7 @@@ void mthca_free_icm(struct mthca_dev *d
  }
  
  struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,
-                                 unsigned int gfp_mask)
+                                 gfp_t gfp_mask)
  {
        struct mthca_icm *icm;
        struct mthca_icm_chunk *chunk = NULL;
@@@ -487,8 -487,7 +487,8 @@@ void mthca_cleanup_user_db_tab(struct m
        }
  }
  
 -int mthca_alloc_db(struct mthca_dev *dev, int type, u32 qn, __be32 **db)
 +int mthca_alloc_db(struct mthca_dev *dev, enum mthca_db_type type,
 +                 u32 qn, __be32 **db)
  {
        int group;
        int start, end, dir;

diff --combined drivers/infiniband/hw/mthca/mthca_memfree.h
index 29c01a4,29433f2..4fdca26
--- 1/drivers/infiniband/hw/mthca/mthca_memfree.h
--- 2/drivers/infiniband/hw/mthca/mthca_memfree.h
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.h
@@@ -77,7 -77,7 +77,7 @@@ struct mthca_icm_iter 
  struct mthca_dev;
  
  struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,
-                                 unsigned int gfp_mask);
+                                 gfp_t gfp_mask);
  void mthca_free_icm(struct mthca_dev *dev, struct mthca_icm *icm);
  
  struct mthca_icm_table *mthca_alloc_icm_table(struct mthca_dev *dev,
@@@ -173,8 -173,7 +173,8 @@@ void mthca_cleanup_user_db_tab(struct m
  
  int mthca_init_db_tab(struct mthca_dev *dev);
  void mthca_cleanup_db_tab(struct mthca_dev *dev);
 -int mthca_alloc_db(struct mthca_dev *dev, int type, u32 qn, __be32 **db);
 +int mthca_alloc_db(struct mthca_dev *dev, enum mthca_db_type type,
 +                 u32 qn, __be32 **db);
  void mthca_free_db(struct mthca_dev *dev, int type, int db_index);
  
  #endif /* MTHCA_MEMFREE_H */