*** sapi/fpm/fpm/fpm_atomic.hSat Jul 21 01:33:58 2012
--- sapi/fpm/fpm/fpm_atomic.hSat Jul 21 01:36:26 2012
***************
*** 75,100 ****
  
  	return res;
  }
  /* }}} */
  
- #if (__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
- 
  #elif ( __arm__ || __arm ) /* W-Mark Kubacki */
  
  #if (__arch64__ || __arch64)
  typedef int64_t                     atomic_int_t;
  typedef uint64_t                    atomic_uint_t;
  #else
  typedef int32_t                     atomic_int_t;
  typedef uint32_t                    atomic_uint_t;
  #endif
  
  #define atomic_cmp_set(a,b,c) __sync_bool_compare_and_swap(a,b,c)
  
- #endif /* defined (__GNUC__) &&... */
- 
  #elif ( __sparc__ || __sparc ) /* Marcin Ochab */
  
  #if (__sparcv9 || __sparcv9__)
  
  #if (__arch64__ || __arch64)
--- 75,100 ----
  
  	return res;
  }
  /* }}} */
  
  #elif ( __arm__ || __arm ) /* W-Mark Kubacki */
  
+ #include <machine/atomic.h>
+ #define __sync_bool_compare_and_swap(a, b, c) atomic_cmpset_32(a, b, c)
+ 
  #if (__arch64__ || __arch64)
  typedef int64_t                     atomic_int_t;
  typedef uint64_t                    atomic_uint_t;
  #else
  typedef int32_t                     atomic_int_t;
  typedef uint32_t                    atomic_uint_t;
  #endif
  
+ typedef volatile atomic_uint_t      atomic_t;
  #define atomic_cmp_set(a,b,c) __sync_bool_compare_and_swap(a,b,c)
  
  #elif ( __sparc__ || __sparc ) /* Marcin Ochab */
  
  #if (__sparcv9 || __sparcv9__)
  
  #if (__arch64__ || __arch64)


*** /root/php/php544/php-5.4.4/sapi/fpm/fpm/fpm_sockets.cFri Aug  3 23:03:06 2012
--- /root/php/php544/php-5.4.4/sapi/fpm/fpm/fpm_sockets.cFri Aug  3 23:05:05 2012
***************
*** 398,411 ****
  
  	/* kernel >= 2.6.24 return non-zero here, that means operation is supported */
! if (info.tcpi_sacked == 0) {
  		return -1;
  	}
  
  	if (cur_lq) {
! \[ *cur_lq = info.tcpi_unacked;
  	}
  
  	if (max_lq) {
! \[ *max_lq = info.tcpi_sacked;
  	}
  
--- 398,411 ----
  
  	/* kernel >= 2.6.24 return non-zero here, that means operation is supported */
! if (info.__tcpi_sacked == 0) {
  		return -1;
  	}
  
  	if (cur_lq) {
! \[ *cur_lq = info.__tcpi_unacked;
  	}
  
  	if (max_lq) {
! \[ *max_lq = info.__tcpi_sacked;
  	}