diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-11-14 09:34:01 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-11-14 09:34:01 +1100 |
| commit | 185c0f26c0267d5978b5c30d3a04f90cb245cd76 (patch) | |
| tree | 4b1324c9445bbcff095fb3ce755ec46d315bda5a /drivers/misc/sgi-gru/grumain.c | |
| parent | eafb7b9d01a7001ff8e9624e7dcb706844f981b3 (diff) | |
| parent | a25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6 (diff) | |
| download | op-kernel-dev-185c0f26c0267d5978b5c30d3a04f90cb245cd76.zip op-kernel-dev-185c0f26c0267d5978b5c30d3a04f90cb245cd76.tar.gz | |
Merge commit 'v4.9-rc5' into next
Diffstat (limited to 'drivers/misc/sgi-gru/grumain.c')
| -rw-r--r-- | drivers/misc/sgi-gru/grumain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c index 1525870..33741ad 100644 --- a/drivers/misc/sgi-gru/grumain.c +++ b/drivers/misc/sgi-gru/grumain.c @@ -283,7 +283,7 @@ static void gru_unload_mm_tracker(struct gru_state *gru, spin_lock(&gru->gs_asid_lock); BUG_ON((asids->mt_ctxbitmap & ctxbitmap) != ctxbitmap); asids->mt_ctxbitmap ^= ctxbitmap; - gru_dbg(grudev, "gid %d, gts %p, gms %p, ctxnum 0x%d, asidmap 0x%lx\n", + gru_dbg(grudev, "gid %d, gts %p, gms %p, ctxnum %d, asidmap 0x%lx\n", gru->gs_gid, gts, gms, gts->ts_ctxnum, gms->ms_asidmap[0]); spin_unlock(&gru->gs_asid_lock); spin_unlock(&gms->ms_asid_lock); |
