Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / sh / include / asm / dwarf.h

diff --git a/arch/sh/include/asm/dwarf.h b/arch/sh/include/asm/dwarf.h
index bdccbbfdc0bd9abbce7c5cbc37168a8429c09808..d62abd1d0c05b31b9da9d4e07dfff264d35abb82 100644 (file)
--- a/arch/sh/include/asm/dwarf.h
+++ b/arch/sh/include/asm/dwarf.h
@@ -243,16 +243,13 @@ struct dwarf_cie {
 
        unsigned long cie_pointer;
 
-       struct list_head link;
-
        unsigned long flags;
 #define DWARF_CIE_Z_AUGMENTATION       (1 << 0)
 
-       /*
-        * 'mod' will be non-NULL if this CIE came from a module's
-        * .eh_frame section.
-        */
-       struct module *mod;
+       /* linked-list entry if this CIE is from a module */
+       struct list_head link;
+
+       struct rb_node node;
 };
 
 /**
@@ -266,13 +263,11 @@ struct dwarf_fde {
        unsigned long address_range;
        unsigned char *instructions;
        unsigned char *end;
+
+       /* linked-list entry if this FDE is from a module */
        struct list_head link;
 
-       /*
-        * 'mod' will be non-NULL if this FDE came from a module's
-        * .eh_frame section.
-        */
-       struct module *mod;
+       struct rb_node node;
 };
 
 /**