summaryrefslogtreecommitdiff
path: root/kern/linux/linux_system.cc
diff options
context:
space:
mode:
authorBenjamin Nash <benash@umich.edu>2005-08-15 17:17:17 -0400
committerBenjamin Nash <benash@umich.edu>2005-08-15 17:17:17 -0400
commitbcc333e92006f52baeef1ae0f94d4765513584d8 (patch)
tree88e3fbd634750cec0e1e4210d62a1f90fd3d2380 /kern/linux/linux_system.cc
parent49063eb24f8fd2ad010224cc282c55dd5471dd65 (diff)
parentb64eae5e52d9eb60ad498464d076b48cd5ceafe3 (diff)
downloadgem5-bcc333e92006f52baeef1ae0f94d4765513584d8.tar.xz
Merge zed.eecs.umich.edu:/.automount/fox/y/mserrano/m5_dir/m5
into zed.eecs.umich.edu:/z/benash/bk/m5 dev/ide_ctrl.cc: dev/ide_ctrl.hh: dev/ide_disk.cc: dev/ide_disk.hh: dev/ns_gige.cc: dev/pciconfigall.cc: dev/pcidev.cc: dev/rtcreg.h: dev/tsunami_io.cc: dev/tsunami_io.hh: dev/uart8250.cc: dev/uart8250.hh: python/m5/objects/Tsunami.py: Merge code. --HG-- extra : convert_revision : e97d5dbcc051d2061622201265430d359f995d48
Diffstat (limited to 'kern/linux/linux_system.cc')
-rw-r--r--kern/linux/linux_system.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/kern/linux/linux_system.cc b/kern/linux/linux_system.cc
index 8c57ce29c..3f360efdd 100644
--- a/kern/linux/linux_system.cc
+++ b/kern/linux/linux_system.cc
@@ -92,7 +92,7 @@ LinuxSystem::LinuxSystem(Params *p)
char *dp264_mv = (char *)physmem->dma_addr(paddr, sizeof(uint64_t));
if (dp264_mv) {
- *(uint32_t*)(dp264_mv+0x18) = htoa((uint32_t)127);
+ *(uint32_t*)(dp264_mv+0x18) = htog((uint32_t)127);
} else
panic("could not translate dp264_mv addr\n");