diff --git a/arch/powerpc/atomic.h b/arch/powerpc/atomic.h index af397599c7f65e5bb73ccb783f9b76135e82e0d2..a83764d9e044fdb13f3151570e9435a4587853b7 100644 --- a/arch/powerpc/atomic.h +++ b/arch/powerpc/atomic.h @@ -101,24 +101,16 @@ static inline void a_or(volatile int *p, int v) static inline void a_and_64(volatile uint64_t *p, uint64_t v) { -#if __BYTE_ORDER == __LITTLE_ENDIAN - a_and((int *)p, v); - a_and((int *)p+1, v>>32); -#else - a_and((int *)p+1, v); - a_and((int *)p, v>>32); -#endif + union { uint64_t v; uint32_t r[2]; } u = { v }; + a_and((int *)p, u.r[0]); + a_and((int *)p+1, u.r[1]); } static inline void a_or_64(volatile uint64_t *p, uint64_t v) { -#if __BYTE_ORDER == __LITTLE_ENDIAN - a_or((int *)p, v); - a_or((int *)p+1, v>>32); -#else - a_or((int *)p+1, v); - a_or((int *)p, v>>32); -#endif + union { uint64_t v; uint32_t r[2]; } u = { v }; + a_or((int *)p, u.r[0]); + a_or((int *)p+1, u.r[1]); } #endif