From d6033ca207965bcb4cedd8bbee42029c1bf5b7f9 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt@console-pimps.org>
Date: Thu, 20 Aug 2009 19:42:34 +0100
Subject: [PATCH] --- yaml --- r: 163487 b: refs/heads/master c:
 5480675dc60c7dda7146e506981b2b40a775cc1e h: refs/heads/master i:   163485:
 ddbb5c42273cea9436b5d29032cf50d9a9e3606e   163483:
 490529732aabbdcb9ee41f50850eb8e3508f388c   163479:
 c7a358c3a9e989fa856e64de55499815c340353b   163471:
 fb073ecce5bc32f1d3aa280e8f8174640dbf8522   163455:
 a7b4e46f1b079dfd9933a123c8ddfe4a2582926f v: v3

---
 [refs]                       | 2 +-
 trunk/arch/sh/kernel/dwarf.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2b3c044452ac..98ab27d40628 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe98dd31eb9fe055703e0171134b4d074558d4e9
+refs/heads/master: 5480675dc60c7dda7146e506981b2b40a775cc1e
diff --git a/trunk/arch/sh/kernel/dwarf.c b/trunk/arch/sh/kernel/dwarf.c
index 606ece37eb42..e6f427cff5ba 100644
--- a/trunk/arch/sh/kernel/dwarf.c
+++ b/trunk/arch/sh/kernel/dwarf.c
@@ -751,7 +751,8 @@ static int dwarf_parse_cie(void *entry, void *p, unsigned long len,
 }
 
 static int dwarf_parse_fde(void *entry, u32 entry_type,
-			   void *start, unsigned long len)
+			   void *start, unsigned long len,
+			   unsigned char *end)
 {
 	struct dwarf_fde *fde;
 	struct dwarf_cie *cie;
@@ -798,7 +799,7 @@ static int dwarf_parse_fde(void *entry, u32 entry_type,
 
 	/* Call frame instructions. */
 	fde->instructions = p;
-	fde->end = start + len;
+	fde->end = end;
 
 	/* Add to list. */
 	spin_lock_irqsave(&dwarf_fde_lock, flags);
@@ -932,7 +933,7 @@ static int __init dwarf_unwinder_init(void)
 			else
 				c_entries++;
 		} else {
-			err = dwarf_parse_fde(entry, entry_type, p, len);
+			err = dwarf_parse_fde(entry, entry_type, p, len, end);
 			if (err < 0)
 				goto out;
 			else