ppc64: fix test_bit and remove workaround in cpu_relax

include/asm-ppc64/bitops.h

@@ -43,7 +43,7 @@
 
 static __inline__ int test_bit(unsigned long nr, __const__ volatile unsigned long *addr)
 {
-	return (1UL & (((__const__ long *) addr)[nr >> 6] >> (nr & 63)));
+	return (1UL & (addr[nr >> 6] >> (nr & 63)));
 }
 
 static __inline__ void set_bit(unsigned long nr, volatile unsigned long *addr)

include/asm-ppc64/processor.h

@@ -692,12 +692,7 @@ unsigned long get_wchan(struct task_struct *p);
 #define KSTK_EIP(tsk)  ((tsk)->thread.regs? (tsk)->thread.regs->nip: 0)
 #define KSTK_ESP(tsk)  ((tsk)->thread.regs? (tsk)->thread.regs->gpr[1]: 0)
 
-/* XXX Temporary work around for a gcc 3.1 bug - Anton */
-#if 0
 #define cpu_relax()     do { } while (0)
-#else
-#define cpu_relax()     barrier()
-#endif
 
 /*
  * Prefetch macros.