xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'timer_setup' into for-next

Browse Source 
Conflicts:
	drivers/infiniband/hw/cxgb4/cm.c
	drivers/infiniband/hw/qib/qib_driver.c
	drivers/infiniband/hw/qib/qib_mad.c

There were minor fixups needed in these files.  Just minor context diffs
due to patches from independent sources touching the same basic area.

Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Doug Ledford
2017-10-18 13:12:09 -04:00
parent 754137a769 a9346abed5
commit 894b82c427
43 changed files with 158 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/infiniband/hw/qib/qib_tx.c
View File

@@ -548,9 +548,9 @@ void qib_hol_up(struct qib_pportdata *ppd)
/*
* This is only called via the timer.
*/
void qib_hol_event(unsigned long opaque)
void qib_hol_event(struct timer_list *t)
{
struct qib_pportdata *ppd = (struct qib_pportdata *)opaque;
struct qib_pportdata *ppd = from_timer(ppd, t, hol_timer);
/* If hardware error, etc, skip. */
if (!(ppd->dd->flags & QIB_INITTED))