diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2006-04-28 14:03:42 -0400 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2006-04-28 14:03:42 -0400 |
commit | 20c85537871c131ec6c23d944db1f6b21da298fe (patch) | |
tree | 60ae6ce1165300453ec1b876539c4b368ab548b4 /arch/sparc/linux/process.cc | |
parent | a183f66a8ad2a1ac822b07d9b399a3a3e6d3cb5c (diff) | |
parent | 7a9c65b7b6f4471c856bf009179c3231074a3930 (diff) | |
download | gem5-20c85537871c131ec6c23d944db1f6b21da298fe.tar.xz |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
cpu/simple/cpu.cc:
Hand merged
--HG--
extra : convert_revision : 68414730c23d41c30cfb7bcfa604029a5fc8622c
Diffstat (limited to 'arch/sparc/linux/process.cc')
-rw-r--r-- | arch/sparc/linux/process.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/linux/process.cc b/arch/sparc/linux/process.cc index ca85a6d2d..4818f1fcc 100644 --- a/arch/sparc/linux/process.cc +++ b/arch/sparc/linux/process.cc @@ -98,7 +98,7 @@ SyscallDesc SparcLinuxProcess::syscallDescs[] = { /* 2 */ SyscallDesc("fork", unimplementedFunc), /* 3 */ SyscallDesc("read", readFunc), /* 4 */ SyscallDesc("write", writeFunc), - /* 5 */ SyscallDesc("open", openFunc<Linux>), + /* 5 */ SyscallDesc("open", openFunc<SparcLinux>), /* 6 */ SyscallDesc("close", closeFunc), /* 7 */ SyscallDesc("wait4", unimplementedFunc), /* 8 */ SyscallDesc("creat", unimplementedFunc), @@ -164,9 +164,9 @@ SyscallDesc SparcLinuxProcess::syscallDescs[] = { /* 68 */ SyscallDesc("pwrite64", unimplementedFunc), /* 69 */ SyscallDesc("geteuid32", unimplementedFunc), /* 70 */ SyscallDesc("getdgid32", unimplementedFunc), - /* 71 */ SyscallDesc("mmap", unimplementedFunc), + /* 71 */ SyscallDesc("mmap", mmapFunc<SparcLinux>), /* 72 */ SyscallDesc("setreuid32", unimplementedFunc), - /* 73 */ SyscallDesc("munmap", unimplementedFunc), + /* 73 */ SyscallDesc("munmap", munmapFunc), /* 74 */ SyscallDesc("mprotect", unimplementedFunc), /* 75 */ SyscallDesc("madvise", unimplementedFunc), /* 76 */ SyscallDesc("vhangup", unimplementedFunc), |