From f02f68d656bb851c731c0572ff02c49693bc8f5a Mon Sep 17 00:00:00 2001
From: Kyle Yan <kyan@codeaurora.org>
Date: Wed, 17 May 2017 16:29:14 -0700
Subject: [PATCH] lrdp-v2: Add support for new name for global deferrable timer
 base

The name of the global deferrable timer base has changed to
'timer_base_deferrable' as of msm-4.9. Modify the timerlist parser to
reflect the change.

Change-Id: I85f21aa8eae38d379d9420eabe60051233811dd2
---
 linux-ramdump-parser-v2/parsers/timerlist.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/linux-ramdump-parser-v2/parsers/timerlist.py b/linux-ramdump-parser-v2/parsers/timerlist.py
index a6ddaec..650fea7 100644
--- a/linux-ramdump-parser-v2/parsers/timerlist.py
+++ b/linux-ramdump-parser-v2/parsers/timerlist.py
@@ -27,6 +27,7 @@ class TimerList(RamParser) :
         self.tvec_base = 'struct tvec_base'
         self.tvec_bases = 'tvec_bases'
         self.next_timer = 'next_timer'
+        self.global_deferrable = 'tvec_base_deferrable'
 
         if (major, minor) >= (4, 9):
             self.vectors = {'vectors': 512}
@@ -34,6 +35,7 @@ class TimerList(RamParser) :
             self.tvec_base = 'struct timer_base'
             self.tvec_bases = 'timer_bases'
             self.next_timer = 'next_expiry'
+            self.global_deferrable = 'timer_base_deferrable'
         # Timerlist structure changed in kernel 4.2
         # Requires separate processing
         if (major, minor) >= (4, 2):
@@ -110,7 +112,7 @@ class TimerList(RamParser) :
     def get_timer_list(self):
         self.output_file.write("Timer List Dump\n\n")
 
-        tvec_base_deferral_addr = self.ramdump.address_of('tvec_base_deferrable')
+        tvec_base_deferral_addr = self.ramdump.address_of(self.global_deferrable)
         if tvec_base_deferral_addr:
             timer_jiffies_addr = tvec_base_deferral_addr + self.ramdump.field_offset(self.tvec_base, self.timer_jiffies)
             next_timer_addr = tvec_base_deferral_addr + self.ramdump.field_offset(self.tvec_base, self.next_timer)
-- 
GitLab