lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gru: add symbolic names for GRU error code

Browse Source 
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>
This commit is contained in:
Jack Steiner
2009-12-15 16:48:14 -08:00
committed by Linus Torvalds
parent 1848a71028
commit 9c13cb331f
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/misc/sgi-gru/grufault.c
View File

@@ -40,6 +40,12 @@
#include "gru_instructions.h" #include "gru_instructions.h"
#include <asm/uv/uv_hub.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 * Test if a physical address is a valid GRU GSEG address
*/ */
@@ -280,12 +286,12 @@ static int gru_vtop(struct gru_thread_state *gts, unsigned long vaddr,
paddr = paddr & ~((1UL << ps) - 1); paddr = paddr & ~((1UL << ps) - 1);
*gpa = uv_soc_phys_ram_to_gpa(paddr); *gpa = uv_soc_phys_ram_to_gpa(paddr);
*pageshift = ps; *pageshift = ps;
return 0; return VTOP_SUCCESS;
inval: inval:
return -1; return VTOP_INVALID;
upm: upm:
return -2; return VTOP_RETRY;
} }
@@ -412,9 +418,9 @@ static int gru_try_dropin(struct gru_thread_state *gts,
goto failactive; goto failactive;
ret = gru_vtop(gts, vaddr, write, atomic, &gpa, &pageshift); ret = gru_vtop(gts, vaddr, write, atomic, &gpa, &pageshift);
if (ret == -1) if (ret == VTOP_INVALID)
goto failinval; goto failinval;
if (ret == -2) if (ret == VTOP_RETRY)
goto failupm; goto failupm;
if (!(gts->ts_sizeavail & GRU_SIZEAVAIL(pageshift))) { if (!(gts->ts_sizeavail & GRU_SIZEAVAIL(pageshift))) {