Skip to content

Commit

Permalink
gru: add symbolic names for GRU error code
Browse files Browse the repository at this point in the history
Use symbol names instead of numbers for error return values for the vtop
functions.

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>
  • Loading branch information
Jack Steiner authored and Linus Torvalds committed Dec 16, 2009
1 parent 1848a71 commit 9c13cb3
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions drivers/misc/sgi-gru/grufault.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@
#include "gru_instructions.h"
#include <asm/uv/uv_hub.h>

/* Return codes for vtop functions */
#define VTOP_SUCCESS 0
#define VTOP_INVALID -1
#define VTOP_RETRY -2


/*
* Test if a physical address is a valid GRU GSEG address
*/
Expand Down Expand Up @@ -280,12 +286,12 @@ static int gru_vtop(struct gru_thread_state *gts, unsigned long vaddr,
paddr = paddr & ~((1UL << ps) - 1);
*gpa = uv_soc_phys_ram_to_gpa(paddr);
*pageshift = ps;
return 0;
return VTOP_SUCCESS;

inval:
return -1;
return VTOP_INVALID;
upm:
return -2;
return VTOP_RETRY;
}


Expand Down Expand Up @@ -412,9 +418,9 @@ static int gru_try_dropin(struct gru_thread_state *gts,
goto failactive;

ret = gru_vtop(gts, vaddr, write, atomic, &gpa, &pageshift);
if (ret == -1)
if (ret == VTOP_INVALID)
goto failinval;
if (ret == -2)
if (ret == VTOP_RETRY)
goto failupm;

if (!(gts->ts_sizeavail & GRU_SIZEAVAIL(pageshift))) {
Expand Down

0 comments on commit 9c13cb3

Please sign in to comment.