From 424762661531c4db9ca2644a4bc8db5ab9dab23a Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt@console-pimps.org>
Date: Sat, 10 Oct 2009 16:17:06 +0100
Subject: [PATCH] --- yaml --- r: 173391 b: refs/heads/master c:
 c2d474d6f8b48b6698343cfc1a3630c4647aa7b2 h: refs/heads/master i:   173389:
 43d1ce95e6ffc0197c18a65fdff96d623bac39e0   173387:
 7b8597893f4bc27df8ddde9fc380001566f8260e   173383:
 9ee89a74ab4970de4b25dbafd04fb61fd0676f25   173375:
 c7e6df70a706aab4349a7c95681d4231352143b2 v: v3

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

diff --git a/[refs] b/[refs]
index 7dc41c9c9bb4..8ac637321ef8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed4fe7f488008f38d5f423f0bcc736b1779d6ddc
+refs/heads/master: c2d474d6f8b48b6698343cfc1a3630c4647aa7b2
diff --git a/trunk/arch/sh/kernel/dwarf.c b/trunk/arch/sh/kernel/dwarf.c
index ce8bff45d72c..f242cd120cf1 100644
--- a/trunk/arch/sh/kernel/dwarf.c
+++ b/trunk/arch/sh/kernel/dwarf.c
@@ -540,7 +540,8 @@ void dwarf_free_frame(struct dwarf_frame *frame)
 }
 
 /**
- *	dwarf_unwind_stack - recursively unwind the stack
+ *	dwarf_unwind_stack - unwind the stack
+ *
  *	@pc: address of the function to unwind
  *	@prev: struct dwarf_frame of the previous stackframe on the callstack
  *
@@ -558,9 +559,9 @@ struct dwarf_frame * dwarf_unwind_stack(unsigned long pc,
 	unsigned long addr;
 
 	/*
-	 * If this is the first invocation of this recursive function we
-	 * need get the contents of a physical register to get the CFA
-	 * in order to begin the virtual unwinding of the stack.
+	 * If we're starting at the top of the stack we need get the
+	 * contents of a physical register to get the CFA in order to
+	 * begin the virtual unwinding of the stack.
 	 *
 	 * NOTE: the return address is guaranteed to be setup by the
 	 * time this function makes its first function call.
@@ -582,9 +583,8 @@ struct dwarf_frame * dwarf_unwind_stack(unsigned long pc,
 	fde = dwarf_lookup_fde(pc);
 	if (!fde) {
 		/*
-		 * This is our normal exit path - the one that stops the
-		 * recursion. There's two reasons why we might exit
-		 * here,
+		 * This is our normal exit path. There are two reasons
+		 * why we might exit here,
 		 *
 		 *	a) pc has no asscociated DWARF frame info and so
 		 *	we don't know how to unwind this frame. This is
@@ -626,10 +626,10 @@ struct dwarf_frame * dwarf_unwind_stack(unsigned long pc,
 
 		} else {
 			/*
-			 * Again, this is the first invocation of this
-			 * recurisve function. We need to physically
-			 * read the contents of a register in order to
-			 * get the Canonical Frame Address for this
+			 * Again, we're starting from the top of the
+			 * stack. We need to physically read
+			 * the contents of a register in order to get
+			 * the Canonical Frame Address for this
 			 * function.
 			 */
 			frame->cfa = dwarf_read_arch_reg(frame->cfa_register);