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>

1 files changed, 4 insertions, 4 deletions

diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c
index c796df0e9d..33d44b0037 100644
--- a/target-i386/op_helper.c
+++ b/target-i386/op_helper.c
@@ -106,7 +106,7 @@ static const CPU86_LDouble f15rk[7] =
 
 /* broken thread support */
 
-static a_spinlock global_cpu_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t global_cpu_lock = SPIN_LOCK_UNLOCKED;
 
 void helper_lock(void)
 {
@@ -4855,7 +4855,7 @@ void helper_svm_check_io(uint32_t port, uint32_t param,
 }
 #else
 
-static inline void svm_save_seg(a_target_phys_addr addr,
+static inline void svm_save_seg(target_phys_addr_t addr,
                                 const SegmentCache *sc)
 {
     stw_phys(addr + offsetof(struct vmcb_seg, selector), 
@@ -4868,7 +4868,7 @@ static inline void svm_save_seg(a_target_phys_addr addr,
              ((sc->flags >> 8) & 0xff) | ((sc->flags >> 12) & 0x0f00));
 }
                                 
-static inline void svm_load_seg(a_target_phys_addr addr, SegmentCache *sc)
+static inline void svm_load_seg(target_phys_addr_t addr, SegmentCache *sc)
 {
     unsigned int flags;
 
@@ -4879,7 +4879,7 @@ static inline void svm_load_seg(a_target_phys_addr addr, SegmentCache *sc)
     sc->flags = ((flags & 0xff) << 8) | ((flags & 0x0f00) << 12);
 }
 
-static inline void svm_load_seg_cache(a_target_phys_addr addr,
+static inline void svm_load_seg_cache(target_phys_addr_t addr, 
                                       CPUState *env, int seg_reg)
 {
     SegmentCache sc1, *sc = &sc1;