From f23aa8ba8a1f7064f1575c8589f444e9c618746e Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Tue, 1 Jan 2008 19:30:30 -0800
Subject: [PATCH] --- yaml --- r: 75260 b: refs/heads/master c:
 76975f8a3186dae501584d0155ea410464f62815 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/ia64/sn/kernel/xp_nofault.S | 10 +++-------
 trunk/include/asm-ia64/sn/xpc.h        |  6 ++----
 trunk/net/x25/x25_forward.c            |  5 +++--
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 74d1c5338967..12fa1a4a33e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2022c1f136067f673964dcaffa1cae1008ddcd74
+refs/heads/master: 76975f8a3186dae501584d0155ea410464f62815
diff --git a/trunk/arch/ia64/sn/kernel/xp_nofault.S b/trunk/arch/ia64/sn/kernel/xp_nofault.S
index 98e7c7dbfdd8..54e8973b6e99 100644
--- a/trunk/arch/ia64/sn/kernel/xp_nofault.S
+++ b/trunk/arch/ia64/sn/kernel/xp_nofault.S
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2004-2007 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2004-2005 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 
@@ -14,11 +14,6 @@
  * PIO read fails, the MCA handler will force the error to look
  * corrected and vector to the xp_error_PIOR which will return an error.
  *
- * The definition of "consumption" and the time it takes for an MCA
- * to surface is processor implementation specific.  This code
- * is sufficient on Itanium through the Montvale processor family.
- * It may need to be adjusted for future processor implementations.
- *
  *	extern int xp_nofault_PIOR(void *remote_register);
  */
 
@@ -27,10 +22,11 @@ xp_nofault_PIOR:
 	mov	r8=r0			// Stage a success return value
 	ld8.acq	r9=[r32];;		// PIO Read the specified register
 	adds	r9=1,r9;;		// Add to force consumption
-	srlz.i;;			// Allow time for MCA to surface
+	or	r9=r9,r9;;		// Or to force consumption
 	br.ret.sptk.many b0;;		// Return success
 
 	.global xp_error_PIOR
 xp_error_PIOR:
 	mov	r8=1			// Return value of 1
 	br.ret.sptk.many b0;;		// Return failure
+
diff --git a/trunk/include/asm-ia64/sn/xpc.h b/trunk/include/asm-ia64/sn/xpc.h
index 3c0900ab8003..8e5d7de9c632 100644
--- a/trunk/include/asm-ia64/sn/xpc.h
+++ b/trunk/include/asm-ia64/sn/xpc.h
@@ -1211,13 +1211,11 @@ 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;
-		return xpcBteUnmappedError;
+		else
+			return xpcBteUnmappedError;
 	}
 	switch (error) {
 	case BTE_SUCCESS:	return xpcSuccess;
diff --git a/trunk/net/x25/x25_forward.c b/trunk/net/x25/x25_forward.c
index 8738ec7ce693..34478035e05e 100644
--- a/trunk/net/x25/x25_forward.c
+++ b/trunk/net/x25/x25_forward.c
@@ -118,13 +118,14 @@ int x25_forward_data(int lci, struct x25_neigh *from, struct sk_buff *skb) {
 		goto out;
 
 	if ( (skbn = pskb_copy(skb, GFP_ATOMIC)) == NULL){
-		goto out;
+		goto output;
 
 	}
 	x25_transmit_link(skbn, nb);
 
-	x25_neigh_put(nb);
 	rc = 1;
+output:
+	x25_neigh_put(nb);
 out:
 	return rc;
 }