2 files changed, 17 insertions, 6 deletions

diff --git a/arch/sh/include/asm/dwarf.h b/arch/sh/include/asm/dwarf.h
index aacdc746d07c..eef87539963d 100644
--- a/arch/sh/include/asm/dwarf.h
+++ b/arch/sh/include/asm/dwarf.h
@@ -376,6 +376,7 @@ static inline unsigned int DW_CFA_operand(unsigned long insn)
 
 extern struct dwarf_frame *dwarf_unwind_stack(unsigned long,
                                               struct dwarf_frame *);
+extern void dwarf_free_frame(struct dwarf_frame *);
 extern int dwarf_parse_section(char *, char *, struct module *);
 extern void dwarf_module_unload(struct module *);
 
diff --git a/arch/sh/kernel/dwarf.c b/arch/sh/kernel/dwarf.c
index 981315c6d656..ce8bff45d72c 100644
--- a/arch/sh/kernel/dwarf.c
+++ b/arch/sh/kernel/dwarf.c
@@ -530,6 +530,16 @@ static int dwarf_cfa_execute_insns(unsigned char *insn_start,
 }
 
 /**
+ *      dwarf_free_frame - free the memory allocated for @frame
+ *      @frame: the frame to free
+ */
+void dwarf_free_frame(struct dwarf_frame *frame)
+{
+        dwarf_frame_free_regs(frame);
+        mempool_free(frame, dwarf_frame_pool);
+}
+
+/**
  *      dwarf_unwind_stack - recursively unwind the stack
  *      @pc: address of the function to unwind
  *      @prev: struct dwarf_frame of the previous stackframe on the callstack
@@ -649,8 +659,7 @@ struct dwarf_frame * dwarf_unwind_stack(unsigned long pc,
         return frame;
 
 bail:
-        dwarf_frame_free_regs(frame);
-        mempool_free(frame, dwarf_frame_pool);
+        dwarf_free_frame(frame);
         return NULL;
 }
 
@@ -837,10 +846,8 @@ static void dwarf_unwinder_dump(struct task_struct *task,
         while (1) {
                 frame = dwarf_unwind_stack(return_addr, _frame);
 
-                if (_frame) {
-                        dwarf_frame_free_regs(_frame);
-                        mempool_free(_frame, dwarf_frame_pool);
-                }
+                if (_frame)
+                        dwarf_free_frame(_frame);
 
                 _frame = frame;
 
@@ -850,6 +857,9 @@ static void dwarf_unwinder_dump(struct task_struct *task,
                 return_addr = frame->return_addr;
                 ops->address(data, return_addr, 1);
         }
+
+        if (frame)
+                dwarf_free_frame(frame);
 }
 
 static struct unwinder dwarf_unwinder = {