diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /drivers/infiniband/hw/hfi1/init.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'drivers/infiniband/hw/hfi1/init.c')
| -rw-r--r-- | drivers/infiniband/hw/hfi1/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c index a358d23ecd54..b7935451093c 100644 --- a/drivers/infiniband/hw/hfi1/init.c +++ b/drivers/infiniband/hw/hfi1/init.c | |||
| @@ -1333,7 +1333,7 @@ static void cleanup_device_data(struct hfi1_devdata *dd) | |||
| 1333 | spin_unlock(&ppd->cc_state_lock); | 1333 | spin_unlock(&ppd->cc_state_lock); |
| 1334 | 1334 | ||
| 1335 | if (cc_state) | 1335 | if (cc_state) |
| 1336 | call_rcu(&cc_state->rcu, cc_state_reclaim); | 1336 | kfree_rcu(cc_state, rcu); |
| 1337 | } | 1337 | } |
| 1338 | 1338 | ||
| 1339 | free_credit_return(dd); | 1339 | free_credit_return(dd); |