From f66ec5f89cb2ef6b7a0c2d813b6204573a6d1adc Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@bnsf.davemloft.net>
Date: Mon, 29 Oct 2007 00:36:09 -0700
Subject: [PATCH] --- yaml --- r: 72965 b: refs/heads/master c:
 7e5766fa9431602ef0e56ceae900d0cce3a78b96 h: refs/heads/master i:   72963:
 2cd1ed59be8e90c64b51c5c321d72866d6cc9905 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/sparc64/mm/tsb.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 49baf67e6a3b..09babc332ff4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 099d575aaf3dcf4c9c1e0b53c7b17c5faddb1b59
+refs/heads/master: 7e5766fa9431602ef0e56ceae900d0cce3a78b96
diff --git a/trunk/arch/sparc64/mm/tsb.c b/trunk/arch/sparc64/mm/tsb.c
index 7ff0a02f5813..a3e6e4b635b3 100644
--- a/trunk/arch/sparc64/mm/tsb.c
+++ b/trunk/arch/sparc64/mm/tsb.c
@@ -182,7 +182,9 @@ static void setup_tsb_params(struct mm_struct *mm, unsigned long tsb_idx, unsign
 		break;
 
 	default:
-		BUG();
+		printk(KERN_ERR "TSB[%s:%d]: Impossible TSB size %lu, killing process.\n",
+		       current->comm, current->pid, tsb_bytes);
+		do_exit(SIGSEGV);
 	};
 	tte |= pte_sz_bits(page_sz);