diff options
| author |   Jack Steiner <steiner@sgi.com> | 2009-12-15 16:48:08 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 07:20:15 -0800 |
| commit | 7f2251b1bcdd3d2971b2fde3008b270ea11b8780 (patch) | |
| tree | 5fc3a2fc089188a6a61e16374a5b715db280aca7 /drivers/misc/sgi-gru/grufault.c | |
| parent | gru: support 64-bit GRU addresses (diff) | |
| download | linux-dev-7f2251b1bcdd3d2971b2fde3008b270ea11b8780.tar.xz linux-dev-7f2251b1bcdd3d2971b2fde3008b270ea11b8780.zip | |
gru: handle failures to mmu_notifier_register
Under some conditions, mmu_notifier_register() will fail to register a
mmu_notifier. Fix the GRU driver to correctly handle these failures.
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc/sgi-gru/grufault.c')
| -rw-r--r-- | drivers/misc/sgi-gru/grufault.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c index 9470303a9cb9..ada7df7e0968 100644 --- a/drivers/misc/sgi-gru/grufault.c +++ b/drivers/misc/sgi-gru/grufault.c @@ -96,7 +96,7 @@ static struct gru_thread_state *gru_alloc_locked_gts(unsigned long vaddr) vma = gru_find_vma(vaddr); if (vma) gts = gru_alloc_thread_state(vma, TSID(vaddr, vma)); - if (gts) { + if (!IS_ERR(gts)) { mutex_lock(>s->ts_ctxlock); downgrade_write(&mm->mmap_sem); } else { @@ -747,8 +747,8 @@ int gru_set_context_option(unsigned long arg) gru_dbg(grudev, "op %d, gseg 0x%lx, value1 0x%lx\n", req.op, req.gseg, req.val1); gts = gru_alloc_locked_gts(req.gseg); - if (!gts) - return -EINVAL; + if (IS_ERR(gts)) + return PTR_ERR(gts); switch (req.op) { case sco_blade_chiplet: |