Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad4db3b2 authored by Jan Kiszka's avatar Jan Kiszka Committed by Linus Torvalds
Browse files

scripts/gdb: account for changes in module data structure 



Commit 7523e4dc ("module: use a structure to encapsulate layout.")
factored out the module_layout structure.  Adjust the symbol loader and
the lsmod command to this.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham@linaro.org>
Tested-by: Kieran Bingham <kieran.bingham@linaro.org> (qemu-{ARM,x86})
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: <stable@vger.kernel.org>	[4.4+]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 72bf92ec

scripts/gdb/linux/modules.py

+3 −2
Original line number Diff line number Diff line
@@ -73,10 +73,11 @@ class LxLsmod(gdb.Command): 
                "        " if utils.get_long_type().sizeof == 8 else ""))



        for module in module_list():

            layout = module['core_layout']

            gdb.write("{address} {name:<19} {size:>8}  {ref}".format(

                address=str(module['module_core']).split()[0],

                address=str(layout['base']).split()[0],

                name=module['name'].string(),

                size=str(module['core_size']),

                size=str(layout['size']),

                ref=str(module['refcnt']['counter'])))



            source_list = module['source_list']

scripts/gdb/linux/symbols.py

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ lx-symbols command.""" 


    def load_module_symbols(self, module):

        module_name = module['name'].string()

        module_addr = str(module['module_core']).split()[0]

        module_addr = str(module['core_layout']['base']).split()[0]



        module_file = self._get_module_file(module_name)

        if not module_file and not self.module_files_updated: