Merge branch 'misc' into for-next
Roland Dreier [Tue, 2 Mar 2010 07:52:31 +0000 (23:52 -0800)]
Conflicts:
drivers/infiniband/core/uverbs_main.c

1  2 
drivers/infiniband/core/uverbs_main.c
drivers/infiniband/hw/mlx4/qp.c

@@@ -79,38 -79,36 +78,36 @@@ static DECLARE_BITMAP(dev_map, IB_UVERB
  static ssize_t (*uverbs_cmd_table[])(struct ib_uverbs_file *file,
                                     const char __user *buf, int in_len,
                                     int out_len) = {
 -      [IB_USER_VERBS_CMD_GET_CONTEXT]         = ib_uverbs_get_context,
 -      [IB_USER_VERBS_CMD_QUERY_DEVICE]        = ib_uverbs_query_device,
 -      [IB_USER_VERBS_CMD_QUERY_PORT]          = ib_uverbs_query_port,
 -      [IB_USER_VERBS_CMD_ALLOC_PD]            = ib_uverbs_alloc_pd,
 -      [IB_USER_VERBS_CMD_DEALLOC_PD]          = ib_uverbs_dealloc_pd,
 -      [IB_USER_VERBS_CMD_REG_MR]              = ib_uverbs_reg_mr,
 -      [IB_USER_VERBS_CMD_DEREG_MR]            = ib_uverbs_dereg_mr,
 +      [IB_USER_VERBS_CMD_GET_CONTEXT]         = ib_uverbs_get_context,
 +      [IB_USER_VERBS_CMD_QUERY_DEVICE]        = ib_uverbs_query_device,
 +      [IB_USER_VERBS_CMD_QUERY_PORT]          = ib_uverbs_query_port,
 +      [IB_USER_VERBS_CMD_ALLOC_PD]            = ib_uverbs_alloc_pd,
 +      [IB_USER_VERBS_CMD_DEALLOC_PD]          = ib_uverbs_dealloc_pd,
 +      [IB_USER_VERBS_CMD_REG_MR]              = ib_uverbs_reg_mr,
 +      [IB_USER_VERBS_CMD_DEREG_MR]            = ib_uverbs_dereg_mr,
        [IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL] = ib_uverbs_create_comp_channel,
 -      [IB_USER_VERBS_CMD_CREATE_CQ]           = ib_uverbs_create_cq,
 -      [IB_USER_VERBS_CMD_RESIZE_CQ]           = ib_uverbs_resize_cq,
 -      [IB_USER_VERBS_CMD_POLL_CQ]             = ib_uverbs_poll_cq,
 -      [IB_USER_VERBS_CMD_REQ_NOTIFY_CQ]       = ib_uverbs_req_notify_cq,
 -      [IB_USER_VERBS_CMD_DESTROY_CQ]          = ib_uverbs_destroy_cq,
 -      [IB_USER_VERBS_CMD_CREATE_QP]           = ib_uverbs_create_qp,
 -      [IB_USER_VERBS_CMD_QUERY_QP]            = ib_uverbs_query_qp,
 -      [IB_USER_VERBS_CMD_MODIFY_QP]           = ib_uverbs_modify_qp,
 -      [IB_USER_VERBS_CMD_DESTROY_QP]          = ib_uverbs_destroy_qp,
 -      [IB_USER_VERBS_CMD_POST_SEND]           = ib_uverbs_post_send,
 -      [IB_USER_VERBS_CMD_POST_RECV]           = ib_uverbs_post_recv,
 -      [IB_USER_VERBS_CMD_POST_SRQ_RECV]       = ib_uverbs_post_srq_recv,
 -      [IB_USER_VERBS_CMD_CREATE_AH]           = ib_uverbs_create_ah,
 -      [IB_USER_VERBS_CMD_DESTROY_AH]          = ib_uverbs_destroy_ah,
 -      [IB_USER_VERBS_CMD_ATTACH_MCAST]        = ib_uverbs_attach_mcast,
 -      [IB_USER_VERBS_CMD_DETACH_MCAST]        = ib_uverbs_detach_mcast,
 -      [IB_USER_VERBS_CMD_CREATE_SRQ]          = ib_uverbs_create_srq,
 -      [IB_USER_VERBS_CMD_MODIFY_SRQ]          = ib_uverbs_modify_srq,
 -      [IB_USER_VERBS_CMD_QUERY_SRQ]           = ib_uverbs_query_srq,
 -      [IB_USER_VERBS_CMD_DESTROY_SRQ]         = ib_uverbs_destroy_srq,
 +      [IB_USER_VERBS_CMD_CREATE_CQ]           = ib_uverbs_create_cq,
 +      [IB_USER_VERBS_CMD_RESIZE_CQ]           = ib_uverbs_resize_cq,
 +      [IB_USER_VERBS_CMD_POLL_CQ]             = ib_uverbs_poll_cq,
 +      [IB_USER_VERBS_CMD_REQ_NOTIFY_CQ]       = ib_uverbs_req_notify_cq,
 +      [IB_USER_VERBS_CMD_DESTROY_CQ]          = ib_uverbs_destroy_cq,
 +      [IB_USER_VERBS_CMD_CREATE_QP]           = ib_uverbs_create_qp,
 +      [IB_USER_VERBS_CMD_QUERY_QP]            = ib_uverbs_query_qp,
 +      [IB_USER_VERBS_CMD_MODIFY_QP]           = ib_uverbs_modify_qp,
 +      [IB_USER_VERBS_CMD_DESTROY_QP]          = ib_uverbs_destroy_qp,
 +      [IB_USER_VERBS_CMD_POST_SEND]           = ib_uverbs_post_send,
 +      [IB_USER_VERBS_CMD_POST_RECV]           = ib_uverbs_post_recv,
 +      [IB_USER_VERBS_CMD_POST_SRQ_RECV]       = ib_uverbs_post_srq_recv,
 +      [IB_USER_VERBS_CMD_CREATE_AH]           = ib_uverbs_create_ah,
 +      [IB_USER_VERBS_CMD_DESTROY_AH]          = ib_uverbs_destroy_ah,
 +      [IB_USER_VERBS_CMD_ATTACH_MCAST]        = ib_uverbs_attach_mcast,
 +      [IB_USER_VERBS_CMD_DETACH_MCAST]        = ib_uverbs_detach_mcast,
 +      [IB_USER_VERBS_CMD_CREATE_SRQ]          = ib_uverbs_create_srq,
 +      [IB_USER_VERBS_CMD_MODIFY_SRQ]          = ib_uverbs_modify_srq,
 +      [IB_USER_VERBS_CMD_QUERY_SRQ]           = ib_uverbs_query_srq,
 +      [IB_USER_VERBS_CMD_DESTROY_SRQ]         = ib_uverbs_destroy_srq,
  };
  
- static struct vfsmount *uverbs_event_mnt;
  static void ib_uverbs_add_one(struct ib_device *device);
  static void ib_uverbs_remove_one(struct ib_device *device);
  
@@@ -933,12 -854,8 +884,10 @@@ out
  static void __exit ib_uverbs_cleanup(void)
  {
        ib_unregister_client(&uverbs_client);
-       mntput(uverbs_event_mnt);
-       unregister_filesystem(&uverbs_event_fs);
        class_destroy(uverbs_class);
        unregister_chrdev_region(IB_UVERBS_BASE_DEV, IB_UVERBS_MAX_DEVICES);
 +      if (overflow_maj)
 +              unregister_chrdev_region(overflow_maj, IB_UVERBS_MAX_DEVICES);
        idr_destroy(&ib_uverbs_pd_idr);
        idr_destroy(&ib_uverbs_mr_idr);
        idr_destroy(&ib_uverbs_mw_idr);
Simple merge