diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-01 16:12:16 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-01 16:12:16 -0500 |
| commit | c227f0995e1722a1abccc28cadf0664266bd8043 (patch) | |
| tree | 39e92c2f818e3e8144978740b914731613af0e40 /target-arm | |
| parent | 99a0949b720a0936da2052cb9a46db04ffc6db29 (diff) | |
Revert "Get rid of _t suffix"
In the very least, a change like this requires discussion on the list.
The naming convention is goofy and it causes a massive merge problem. Something
like this _must_ be presented on the list first so people can provide input
and cope with it.
This reverts commit 99a0949b720a0936da2052cb9a46db04ffc6db29.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'target-arm')
| -rw-r--r-- | target-arm/helper.c | 4 | ||||
| -rw-r--r-- | target-arm/op_helper.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c index 7a61c1c0e5..701629af3a 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -520,7 +520,7 @@ void HELPER(clrex)(CPUState *env) flush_mmon(env->mmon_entry->addr); } -a_target_phys_addr cpu_get_phys_page_debug(CPUState *env, target_ulong addr) +target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr) { return addr; } @@ -1230,7 +1230,7 @@ int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address, return 1; } -a_target_phys_addr cpu_get_phys_page_debug(CPUState *env, target_ulong addr) +target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr) { uint32_t phys_addr; int prot; diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 24382a0608..d4ae4ae7e3 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -30,7 +30,7 @@ void raise_exception(int tt) /* thread support */ -static a_spinlock global_cpu_lock = SPIN_LOCK_UNLOCKED; +static spinlock_t global_cpu_lock = SPIN_LOCK_UNLOCKED; void cpu_lock(void) { |