--- zzzz-none-000/linux-2.4.17/include/asm-ppc/byteorder.h	2001-11-03 01:43:54.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/include/asm-ppc/byteorder.h	2004-11-24 13:21:50.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * BK Id: SCCS/s.byteorder.h 1.8 10/11/01 13:02:49 trini
+ * BK Id: SCCS/s.byteorder.h 1.10 11/04/01 23:02:40 paulus
  */
 #ifndef _PPC_BYTEORDER_H
 #define _PPC_BYTEORDER_H
@@ -35,17 +35,11 @@
 	__asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
 }
 
-/* alas, egcs sounds like it has a bug in this code that doesn't use the
-   inline asm correctly, and can cause file corruption. Until I hear that
-   it's fixed, I can live without the extra speed. I hope. */
-#if 0
 static __inline__ __const__ __u16 ___arch__swab16(__u16 value)
 {
 	__u16 result;
 
-	__asm__("rlwimi %0,%1,8,16,23"
-	    : "=r" (result)
-	    : "r" (value), "0" (value >> 8));
+	__asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (value >> 8), "r" (value));
 	return result;
 }
 
@@ -53,16 +47,14 @@
 {
 	__u32 result;
 
-	__asm__("rlwimi %0,%1,24,16,23\n\t"
-	    "rlwimi %0,%1,8,8,15\n\t"
-	    "rlwimi %0,%1,24,0,7"
-	    : "=r" (result)
-	    : "r" (value), "0" (value >> 24));
+	__asm__("rlwimi %0,%2,24,16,23" : "=&r" (result) : "0" (value>>24), "r" (value));
+	__asm__("rlwimi %0,%2,8,8,15"   : "=&r" (result) : "0" (result),    "r" (value));
+	__asm__("rlwimi %0,%2,24,0,7"   : "=&r" (result) : "0" (result),    "r" (value));
+
 	return result;
 }
 #define __arch__swab32(x) ___arch__swab32(x)
 #define __arch__swab16(x) ___arch__swab16(x)
-#endif /* 0 */
 
 /* The same, but returns converted value from the location pointer by addr. */
 #define __arch__swab16p(addr) ld_le16(addr)