changeset b105ac205021 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=b105ac205021
description:
arm: Accomodate function name changes in newer linux kernels
diffstat:
src/arch/arm/linux/system.cc | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diffs (28 lines):
diff -r 1fbc4a0427f0 -r b105ac205021 src/arch/arm/linux/system.cc
--- a/src/arch/arm/linux/system.cc Thu Oct 17 10:20:45 2013 -0500
+++ b/src/arch/arm/linux/system.cc Thu Oct 17 10:20:45 2013 -0500
@@ -80,13 +80,20 @@
}
// With ARM udelay() is #defined to __udelay
- uDelaySkipEvent = addKernelFuncEventOrPanic<UDelayEvent>(
- "__udelay", "__udelay", 1000, 0);
+ // newer kernels use __loop_udelay and __loop_const_udelay symbols
+ uDelaySkipEvent = addKernelFuncEvent<UDelayEvent>(
+ "__loop_udelay", "__udelay", 1000, 0);
+ if(!uDelaySkipEvent)
+ uDelaySkipEvent = addKernelFuncEventOrPanic<UDelayEvent>(
+ "__udelay", "__udelay", 1000, 0);
// constant arguments to udelay() have some precomputation done ahead of
// time. Constant comes from code.
- constUDelaySkipEvent = addKernelFuncEventOrPanic<UDelayEvent>(
- "__const_udelay", "__const_udelay", 1000, 107374);
+ constUDelaySkipEvent = addKernelFuncEvent<UDelayEvent>(
+ "__loop_const_udelay", "__const_udelay", 1000, 107374);
+ if(!constUDelaySkipEvent)
+ constUDelaySkipEvent = addKernelFuncEventOrPanic<UDelayEvent>(
+ "__const_udelay", "__const_udelay", 1000, 107374);
secDataPtrAddr = 0;
secDataAddr = 0;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
