[Patch 21/29] GRU - Add symbolic names for GRU error code

steiner
2009-11-24T15:10:43Z

[-- Attachment #1: uv_gru_error_return_names --]
[-- Type: text/plain, Size: 1480 bytes --]

From: Jack Steiner <steiner@sgi.com>

Use symbol names instead of numbers for error return values
for the vtop functions.

Signed-off-by: Jack Steiner <steiner@sgi.com>

---
drivers/misc/sgi-gru/grufault.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)

Index: linux/drivers/misc/sgi-gru/grufault.c
===================================================================
--- linux.orig/drivers/misc/sgi-gru/grufault.c 2009-11-20 09:32:35.000000000 -0600
+++ linux/drivers/misc/sgi-gru/grufault.c 2009-11-20 09:32:36.000000000 -0600
@@ -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
*/
@@ -280,12 +285,12 @@ static int gru_vtop(struct gru_thread_st
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;
}

@@ -412,9 +417,9 @@ static int gru_try_dropin(struct gru_thr
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))) {