diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 02:34:52 -0500 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 02:34:52 -0500 |
commit | 0e4a80df1a471671b6ef7003e29124b6835ade42 (patch) | |
tree | 1d2c44d8c3462dd94c0fbf6e4f149e026c901aa8 /kern/linux/aligned.hh | |
parent | a48c24b61eedf580645ff0294b225d1e69a9444b (diff) | |
parent | 463aa6d49d49ba9c383f07207df57bad75c58ec9 (diff) | |
download | gem5-0e4a80df1a471671b6ef7003e29124b6835ade42.tar.xz |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision : 090b30a7f70294e1aeb13ba0bc15da4061bdf348
Diffstat (limited to 'kern/linux/aligned.hh')
-rw-r--r-- | kern/linux/aligned.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kern/linux/aligned.hh b/kern/linux/aligned.hh index 18d1b43c0..137f65076 100644 --- a/kern/linux/aligned.hh +++ b/kern/linux/aligned.hh @@ -37,7 +37,7 @@ #if __GNUC__ == 3 && __GNUC_MINOR__ != 3 typedef uint64_t uint64_ta __attribute__ ((aligned (8))) ; typedef int64_t int64_ta __attribute__ ((aligned (8))) ; -typedef Addr Addr_a __attribute__ ((aligned (8))) ; +typedef TheISA::Addr Addr_a __attribute__ ((aligned (8))) ; #else #define uint64_ta uint64_t __attribute__ ((aligned (8))) #define int64_ta int64_t __attribute__ ((aligned (8))) |