]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[IA64] Update Altix BTE error return status patch
authorRuss Anderson <rja@sgi.com>
Thu, 20 Dec 2007 23:46:52 +0000 (17:46 -0600)
committerTony Luck <tony.luck@intel.com>
Thu, 3 Jan 2008 21:18:58 +0000 (13:18 -0800)
I neglected to send Tony the most recent version of the
patch ("Fix Altix BTE error return status") applied
as commit: 64135fa97ce016058f95345425a9ebd04ee1bd2a

This patch gets it up to date.  Without this patch
on shub2, if there is no error xpcBteUnmappedError is
returned instead of xpcSuccess.

Signed-off-by: Russ Anderson (rja@sgi.com)
Signed-off-by: Tony Luck <tony.luck@intel.com>
include/asm-ia64/sn/xpc.h

index 8e5d7de9c63217d4518847670ab5466022f2a44c..3c0900ab8003172b4d41f1dcd8f2139a1c1a6013 100644 (file)
@@ -1211,11 +1211,13 @@ xpc_IPI_init(int index)
 static inline enum xpc_retval
 xpc_map_bte_errors(bte_result_t error)
 {
+       if (error == BTE_SUCCESS)
+               return xpcSuccess;
+
        if (is_shub2()) {
                if (BTE_VALID_SH2_ERROR(error))
                        return xpcBteSh2Start + error;
-               else
-                       return xpcBteUnmappedError;
+               return xpcBteUnmappedError;
        }
        switch (error) {
        case BTE_SUCCESS:       return xpcSuccess;