diff --git a/linux-ramdump-parser-v2/parsers/irqstate.py b/linux-ramdump-parser-v2/parsers/irqstate.py index fb94c9a69a42f97548be1d507e186125d088aa7b..ec428646a0797c9a0229a6a926a1e5762d245063 100755 --- a/linux-ramdump-parser-v2/parsers/irqstate.py +++ b/linux-ramdump-parser-v2/parsers/irqstate.py @@ -74,7 +74,7 @@ class IrqParse(RamParser): def radix_tree_lookup_element(self, ram_dump, root_addr, index): rnode_offset = ram_dump.field_offset('struct radix_tree_root', 'rnode') - if (ram_dump.major[0], ram_dump.major[1]) >= (3, 18): + if (ram_dump.kernel_version[0], ram_dump.kernel_version[1]) >= (3, 18): rnode_height_offset = ram_dump.field_offset( 'struct radix_tree_node', 'path') else: @@ -98,7 +98,7 @@ class IrqParse(RamParser): node_addr = ram_dump.read_word(root_addr + rnode_offset) & 0xfffffffffffffffe height = ram_dump.read_int(node_addr + rnode_height_offset) - if (ram_dump.major[0], ram_dump.major[1]) >= (3, 18): + if (ram_dump.kernel_version[0], ram_dump.kernel_version[1]) >= (3, 18): height = height & radix_tree_height_mask if height > len(height_to_maxindex): diff --git a/linux-ramdump-parser-v2/ramdump.py b/linux-ramdump-parser-v2/ramdump.py index ac48542aef16db7be665c4ddde1e1f83126a28b1..8c77aba53fef2ec17a8264642c40c6126ec9cb93 100644 --- a/linux-ramdump-parser-v2/ramdump.py +++ b/linux-ramdump-parser-v2/ramdump.py @@ -466,7 +466,7 @@ class RamDump(): self.ipc_log_debug = options.ipc_debug self.ipc_log_help = options.ipc_help self.use_stdout = options.stdout - self.major = [0, 0, 0] + self.kernel_version = [0, 0, 0] if options.ram_addr is not None: # TODO sanity check to make sure the memory regions don't overlap for file_path, start, end in options.ram_addr: @@ -634,7 +634,7 @@ class RamDump(): self.version = v.group(1) match = re.search('(\d+)\.(\d+)\.(\d+)', self.version) if match is not None: - self.major[0], self.major[1], self.major[2] = map(int, match.groups()) + self.kernel_version = map(int, match.groups()) else: print_out_str('!!! Could not extract version info! {0}'.format(self.version))