diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-03-14 18:01:07 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-03-14 18:01:07 -0500 |
| commit | efdab1748f249e1d8e042f4ca29c6e247a32ff90 (patch) | |
| tree | 488c4af088a69b1aa701e9b3203f69637f673722 /arch | |
| parent | f5ef4c55331a72839c625c990b544c261e03b914 (diff) | |
| parent | 2adf334642d3b7f8359ca4e3f324833850c9733a (diff) | |
| download | gem5-efdab1748f249e1d8e042f4ca29c6e247a32ff90.tar.xz | |
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision : ba27a3ba99b567f5a8a41d9cd3a09d38c820ed89
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/alpha/alpha_tru64_process.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/alpha_tru64_process.cc b/arch/alpha/alpha_tru64_process.cc index 22e74cb40..1722b658e 100644 --- a/arch/alpha/alpha_tru64_process.cc +++ b/arch/alpha/alpha_tru64_process.cc @@ -953,7 +953,7 @@ class Tru64 { Tru64::nxm_sched_state *ssp = &rad_state->nxm_ss[thread_index]; if (ssp->nxm_u.nxm_active != 0) - return Tru64::KERN_NOT_RECEIVER; + return (int) Tru64::KERN_NOT_RECEIVER; ssp->nxm_u.pth_id = attrp->pthid; ssp->nxm_u.nxm_active = uniq_val | 1; |