Merge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linux

--HG--
extra : convert_revision : 69440981a018ce8b7c1c8a73404da0a39faa3ac3

1 files changed, 2 insertions, 0 deletions

diff --git a/kern/linux/linux_system.hh b/kern/linux/linux_system.hh
index eba65d648..53800db29 100644
--- a/kern/linux/linux_system.hh
+++ b/kern/linux/linux_system.hh
@@ -44,6 +44,7 @@ class BreakPCEvent;
 class LinuxBadAddrEvent;
 class LinuxSkipFuncEvent;
 class LinuxSkipDelayLoopEvent;
+class LinuxSkipIdeDelay50msEvent;
 class LinuxPrintfEvent;
 class LinuxDebugPrintfEvent;
 class LinuxDumpMbufEvent;
@@ -101,6 +102,7 @@ class LinuxSystem : public System
     LinuxBadAddrEvent *badaddrEvent;
     LinuxSkipFuncEvent *skipPowerStateEvent;
     LinuxSkipFuncEvent *skipScavengeBootEvent;
+    LinuxSkipIdeDelay50msEvent *skipIdeDelay50msEvent;
     LinuxSkipDelayLoopEvent *skipDelayLoopEvent;
     LinuxPrintfEvent *printfEvent;
     LinuxDebugPrintfEvent *debugPrintfEvent;