1 files changed, 11 insertions, 19 deletions

diff --git a/arch/sh/include/asm/dwarf.h b/arch/sh/include/asm/dwarf.h
index d3d3837c5e1b..ced6795891a6 100644
--- a/arch/sh/include/asm/dwarf.h
+++ b/arch/sh/include/asm/dwarf.h
@@ -200,7 +200,7 @@
  */
 static __always_inline unsigned long dwarf_read_arch_reg(unsigned int reg)
 {
-        unsigned long value;
+        unsigned long value = 0;
 
         switch (reg) {
         case 14:
@@ -265,10 +265,7 @@ struct dwarf_frame {
 
         unsigned long pc;
 
-        struct dwarf_reg *regs;
-        unsigned int num_regs;  /* how many regs are allocated? */
-
-        unsigned int depth;     /* what level are we in the callstack? */
+        struct list_head reg_list;
 
         unsigned long cfa;
 
@@ -292,20 +289,15 @@ struct dwarf_frame {
  *      @flags: Describes how to calculate the value of this register
  */
 struct dwarf_reg {
+        struct list_head link;
+
+        unsigned int number;
+
         unsigned long addr;
         unsigned long flags;
 #define DWARF_REG_OFFSET        (1 << 0)
-};
-
-/**
- *      dwarf_stack - a DWARF stack contains a collection of DWARF frames
- *      @depth: the number of frames in the stack
- *      @level: an array of DWARF frames, indexed by stack level
- *
- */
-struct dwarf_stack {
-        unsigned int depth;
-        struct dwarf_frame **level;
+#define DWARF_VAL_OFFSET        (1 << 1)
+#define DWARF_UNDEFINED         (1 << 2)
 };
 
 /*
@@ -370,17 +362,16 @@ static inline unsigned int DW_CFA_operand(unsigned long insn)
 #define DW_EXT_HI       0xffffffff
 #define DW_EXT_DWARF64  DW_EXT_HI
 
-extern void dwarf_unwinder_init(void);
-
 extern struct dwarf_frame *dwarf_unwind_stack(unsigned long,
                                               struct dwarf_frame *);
-#endif /* __ASSEMBLY__ */
+#endif /* !__ASSEMBLY__ */
 
 #define CFI_STARTPROC   .cfi_startproc
 #define CFI_ENDPROC     .cfi_endproc
 #define CFI_DEF_CFA     .cfi_def_cfa
 #define CFI_REGISTER    .cfi_register
 #define CFI_REL_OFFSET  .cfi_rel_offset
+#define CFI_UNDEFINED   .cfi_undefined
 
 #else
 
@@ -394,6 +385,7 @@ extern struct dwarf_frame *dwarf_unwind_stack(unsigned long,
 #define CFI_DEF_CFA     CFI_IGNORE
 #define CFI_REGISTER    CFI_IGNORE
 #define CFI_REL_OFFSET  CFI_IGNORE
+#define CFI_UNDEFINED   CFI_IGNORE
 
 #ifndef __ASSEMBLY__
 static inline void dwarf_unwinder_init(void)