From b4da5e677a1fd6e4dd7bcf5691b0a7f58dfe9857 Mon Sep 17 00:00:00 2001
From: Mike Habeck <habeck@sgi.com>
Date: Wed, 26 Apr 2006 12:05:50 -0500
Subject: [PATCH] --- yaml --- r: 26274 b: refs/heads/master c:
 cda3d4a069b915cf46e640bb6872a9d9aefeaabe h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/ia64/sn/pci/tioce_provider.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1c84b8ef617c..3970892b7c82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1df57c0c21c92a6d4fcfe5304c84151ed9beb7a2
+refs/heads/master: cda3d4a069b915cf46e640bb6872a9d9aefeaabe
diff --git a/trunk/arch/ia64/sn/pci/tioce_provider.c b/trunk/arch/ia64/sn/pci/tioce_provider.c
index fa073cc4b565..833295624e5d 100644
--- a/trunk/arch/ia64/sn/pci/tioce_provider.c
+++ b/trunk/arch/ia64/sn/pci/tioce_provider.c
@@ -682,9 +682,6 @@ tioce_reserve_m32(struct tioce_kernel *ce_kern, u64 base, u64 limit)
 	int ate_index, last_ate, ps;
 	struct tioce *ce_mmr;
 
-	if (!TIOCE_M32_ADDR(base))
-		return;
-
 	ce_mmr = (struct tioce *)ce_kern->ce_common->ce_pcibus.bs_base;
 	ps = ce_kern->ce_ate3240_pagesize;
 	ate_index = ATE_PAGE(base, ps);
@@ -693,6 +690,9 @@ tioce_reserve_m32(struct tioce_kernel *ce_kern, u64 base, u64 limit)
 	if (ate_index < 64)
 		ate_index = 64;
 
+	if (last_ate >= TIOCE_NUM_M3240_ATES)
+		last_ate = TIOCE_NUM_M3240_ATES - 1;
+
 	while (ate_index <= last_ate) {
 		u64 ate;