lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)

Browse Source
This commit is contained in:
Roland Dreier
2005-10-24 10:55:29 -07:00
parent bbf2078609 5d7edb3c1a
commit ec329a1359
99 changed files with 1200 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/infiniband/core/cm.c
View File

@@ -3338,6 +3338,7 @@ static void __exit ib_cm_cleanup(void)
flush_workqueue(cm.wq);
destroy_workqueue(cm.wq);
ib_unregister_client(&cm_client);
idr_destroy(&cm.local_id_table);
}
module_init(ib_cm_init);

1
drivers/infiniband/core/sa_query.c
View File

@@ -993,6 +993,7 @@ static int __init ib_sa_init(void)
static void __exit ib_sa_cleanup(void)
{
ib_unregister_client(&sa_client);
idr_destroy(&query_idr);
}
module_init(ib_sa_init);

1
drivers/infiniband/core/ucm.c
View File

@@ -1450,6 +1450,7 @@ static void __exit ib_ucm_cleanup(void)
ib_unregister_client(&ucm_client);
class_unregister(&ucm_class);
unregister_chrdev_region(IB_UCM_BASE_DEV, IB_UCM_MAX_DEVICES);
idr_destroy(&ctx_id_table);
}
module_init(ib_ucm_init);

7
drivers/infiniband/core/uverbs_main.c
View File

@@ -802,6 +802,13 @@ static void __exit ib_uverbs_cleanup(void)
unregister_filesystem(&uverbs_event_fs);
class_unregister(&uverbs_class);
unregister_chrdev_region(IB_UVERBS_BASE_DEV, IB_UVERBS_MAX_DEVICES);
idr_destroy(&ib_uverbs_pd_idr);
idr_destroy(&ib_uverbs_mr_idr);
idr_destroy(&ib_uverbs_mw_idr);
idr_destroy(&ib_uverbs_ah_idr);
idr_destroy(&ib_uverbs_cq_idr);
idr_destroy(&ib_uverbs_qp_idr);
idr_destroy(&ib_uverbs_srq_idr);
}
module_init(ib_uverbs_init);