Merge "lrdp_v2: Fix get_wdog_timing for kernel version 4.9" into opensource-tools.lnx.1.0

linux-ramdump-parser-v2/watchdog_v2.py

@@ -875,10 +875,9 @@ def get_wdog_timing(ramdump):
         wdog_task, 'struct task_struct', 'state')
     wdog_task_threadinfo = ramdump.read_structure_field(
         wdog_task, 'struct task_struct', 'stack')
+    wdog_task_cpu = ramdump.get_task_cpu(wdog_task, wdog_task_threadinfo)
     wdog_task_oncpu = ramdump.read_structure_field(
         wdog_task, 'struct task_struct', 'on_cpu')
-    wdog_task_cpu = ramdump.read_structure_field(
-        wdog_task_threadinfo, 'struct thread_info', 'cpu')
     wdog_task_arrived = ramdump.read_structure_field(
         wdog_task, 'struct task_struct', 'sched_info.last_arrival')
     wdog_task_queued = ramdump.read_structure_field(
@@ -941,6 +940,7 @@ def get_wdog_timing(ramdump):
             'tick_cpu_device') + ramdump.per_cpu_offset(i)
         evt_dev = ramdump.read_structure_field(
             tick_cpu_device, 'struct tick_device', 'evtdev')
+        if evt_dev != 0:
             next_event = ramdump.read_structure_field(
                 evt_dev, 'struct clock_event_device', 'next_event')
             next_event = ns_to_sec(next_event)