summaryrefslogtreecommitdiff
path: root/kern
diff options
context:
space:
mode:
authorBenjamin Nash <benash@umich.edu>2005-07-01 15:57:14 -0400
committerBenjamin Nash <benash@umich.edu>2005-07-01 15:57:14 -0400
commit6d7911dea0a4f60cbe6726416a9e3248843cc03b (patch)
treedf48c6631e28a368a27f04b6a7ddee854f938d2b /kern
parent6bf97032135fcff8eb4993409cef3511db800e6c (diff)
parent4f2480a18bdf98792e2ebf3471ce7cd3109ef824 (diff)
downloadgem5-6d7911dea0a4f60cbe6726416a9e3248843cc03b.tar.xz
Hand merge ide_disk.cc
dev/ide_disk.cc: Don't initialize data to 0. --HG-- extra : convert_revision : 643bcf15b52c3e14231d8136b8cb049a8896457a
Diffstat (limited to 'kern')
-rw-r--r--kern/freebsd/freebsd_system.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/kern/freebsd/freebsd_system.cc b/kern/freebsd/freebsd_system.cc
index bce746a83..2eb80b8e9 100644
--- a/kern/freebsd/freebsd_system.cc
+++ b/kern/freebsd/freebsd_system.cc
@@ -88,8 +88,8 @@ FreebsdSystem::doCalibrateClocks(ExecContext *xc)
uint8_t *ppc = physmem->dma_addr(ppc_paddr, sizeof(uint32_t));
uint8_t *timer = physmem->dma_addr(timer_paddr, sizeof(uint32_t));
- *(uint32_t *)ppc = 2000000000;
- *(uint32_t *)timer = 1193180;
+ *(uint32_t *)ppc = htoa((uint32_t)2000000000);
+ *(uint32_t *)timer = htoa((uint32_t)1193180);
}