diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-24 13:55:29 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2005-10-24 13:55:29 -0400 |
| commit | ec329a135974f1c400214dab02f09584d4beeba9 (patch) | |
| tree | 235be754f76f4e7d51975d2434f226cfc75cdd08 /drivers/infiniband/core/cm.c | |
| parent | bbf207860931b6a033d0fbcd170ae2332c0d8216 (diff) | |
| parent | 5d7edb3c1a01310725d86f0d83fb3be45685dc82 (diff) | |
Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
Diffstat (limited to 'drivers/infiniband/core/cm.c')
| -rw-r--r-- | drivers/infiniband/core/cm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 6f747debca90..3fe6f4754fa8 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c | |||
| @@ -3338,6 +3338,7 @@ static void __exit ib_cm_cleanup(void) | |||
| 3338 | flush_workqueue(cm.wq); | 3338 | flush_workqueue(cm.wq); |
| 3339 | destroy_workqueue(cm.wq); | 3339 | destroy_workqueue(cm.wq); |
| 3340 | ib_unregister_client(&cm_client); | 3340 | ib_unregister_client(&cm_client); |
| 3341 | idr_destroy(&cm.local_id_table); | ||
| 3341 | } | 3342 | } |
| 3342 | 3343 | ||
| 3343 | module_init(ib_cm_init); | 3344 | module_init(ib_cm_init); |