diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2011-10-28 13:04:33 -0500 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2011-10-28 13:04:33 -0500 |
| commit | 706323fa21de674d8064c95a3c0036f0342430ee (patch) | |
| tree | 40bcf3249c0d9d9b21a70f65f0e56ca9020017f7 /src/arch/arm/linux | |
| parent | cbaebb3b5ebe709689f481ad395034335bea2152 (diff) | |
| parent | 6f9d294e8685f49d91af48065736ac1d67e53718 (diff) | |
| download | gem5-706323fa21de674d8064c95a3c0036f0342430ee.tar.xz | |
Merged with recent changes.
Diffstat (limited to 'src/arch/arm/linux')
| -rw-r--r-- | src/arch/arm/linux/linux.hh | 1 | ||||
| -rw-r--r-- | src/arch/arm/linux/process.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/arm/linux/linux.hh b/src/arch/arm/linux/linux.hh index 33e48fc93..40d586aaf 100644 --- a/src/arch/arm/linux/linux.hh +++ b/src/arch/arm/linux/linux.hh @@ -91,6 +91,7 @@ class ArmLinux : public Linux /// For mmap(). static const unsigned TGT_MAP_ANONYMOUS = 0x20; + static const unsigned TGT_MAP_FIXED = 0x10; //@{ /// For getrusage(). diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc index f17749252..c65962d00 100644 --- a/src/arch/arm/linux/process.cc +++ b/src/arch/arm/linux/process.cc @@ -503,7 +503,7 @@ void ArmLinuxProcess::initState() { ArmLiveProcess::initState(); - pTable->allocate(commPage, PageBytes); + allocateMem(commPage, PageBytes); ThreadContext *tc = system->getThreadContext(contextIds[0]); uint8_t swiNeg1[] = { |