From: Russ Anderson <rja@efs.americas.sgi.com>
Date: Fri, 11 Nov 2005 22:52:02 +0000 (-0600)
Subject: [IA64-SGI] bte_copy nasid_index fix
X-Git-Tag: v2.6.15-rc3~129^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab2ff46a2d22177daeae4d473c8916e4f14b4253;p=linux-2.6

[IA64-SGI] bte_copy nasid_index fix

The nasid_index was not being incremented if the
pointer was null, causing an infinite loop.

Signed-off-by: Russ Anderson (rja@sgi.com)
Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c
index d71f4de44f..dd73c0cb75 100644
--- a/arch/ia64/sn/kernel/bte.c
+++ b/arch/ia64/sn/kernel/bte.c
@@ -137,6 +137,7 @@ retry_bteop:
 			bte = bte_if_on_node(nasid_to_try[nasid_index],bte_if_index);
 
 			if (bte == NULL) {
+				nasid_index++;
 				continue;
 			}