Index: kernel/arch/amd64/include/byteorder.h
===================================================================
--- kernel/arch/amd64/include/byteorder.h	(revision b84ce45da9a88a07aa08440a60c3520e28ffd2e2)
+++ kernel/arch/amd64/include/byteorder.h	(revision b6e97d717db99cd0ea1752d7ad38b2d4d440fdd5)
@@ -42,6 +42,6 @@
 #define uint64_t_le2host(n)		(n)
 
-#define uint32_t_be2host(n)		uint64_t_byteorder_swap(n)
-#define uint64_t_be2host(n)		uint32_t_byteorder_swap(n)
+#define uint32_t_be2host(n)		uint32_t_byteorder_swap(n)
+#define uint64_t_be2host(n)		uint64_t_byteorder_swap(n)
 
 #endif
Index: kernel/arch/ia32/include/byteorder.h
===================================================================
--- kernel/arch/ia32/include/byteorder.h	(revision b84ce45da9a88a07aa08440a60c3520e28ffd2e2)
+++ kernel/arch/ia32/include/byteorder.h	(revision b6e97d717db99cd0ea1752d7ad38b2d4d440fdd5)
@@ -42,6 +42,6 @@
 #define uint64_t_le2host(n)		(n)
 
-#define uint32_t_be2host(n)		uint64_t_byteorder_swap(n)
-#define uint64_t_be2host(n)		uint32_t_byteorder_swap(n)
+#define uint32_t_be2host(n)		uint32_t_byteorder_swap(n)
+#define uint64_t_be2host(n)		uint64_t_byteorder_swap(n)
 
 #endif
Index: kernel/arch/ia64/include/byteorder.h
===================================================================
--- kernel/arch/ia64/include/byteorder.h	(revision b84ce45da9a88a07aa08440a60c3520e28ffd2e2)
+++ kernel/arch/ia64/include/byteorder.h	(revision b6e97d717db99cd0ea1752d7ad38b2d4d440fdd5)
@@ -42,6 +42,6 @@
 #define uint64_t_le2host(n)		(n)
 
-#define uint32_t_be2host(n)		uint64_t_byteorder_swap(n)
-#define uint64_t_be2host(n)		uint32_t_byteorder_swap(n)
+#define uint32_t_be2host(n)		uint32_t_byteorder_swap(n)
+#define uint64_t_be2host(n)		uint64_t_byteorder_swap(n)
 
 #endif
Index: kernel/arch/mips32/include/byteorder.h
===================================================================
--- kernel/arch/mips32/include/byteorder.h	(revision b84ce45da9a88a07aa08440a60c3520e28ffd2e2)
+++ kernel/arch/mips32/include/byteorder.h	(revision b6e97d717db99cd0ea1752d7ad38b2d4d440fdd5)
@@ -40,6 +40,6 @@
 #ifdef BIG_ENDIAN
 
-#define uint32_t_le2host(n)		uint64_t_byteorder_swap(n)
-#define uint64_t_le2host(n)		uint32_t_byteorder_swap(n)
+#define uint32_t_le2host(n)		uint32_t_byteorder_swap(n)
+#define uint64_t_le2host(n)		uint64_t_byteorder_swap(n)
 
 #define uint32_t_be2host(n)		(n)
@@ -51,6 +51,6 @@
 #define uint64_t_le2host(n)		(n)
 
-#define uint32_t_be2host(n)		uint64_t_byteorder_swap(n)
-#define uint64_t_be2host(n)		uint32_t_byteorder_swap(n)
+#define uint32_t_be2host(n)		uint32_t_byteorder_swap(n)
+#define uint64_t_be2host(n)		uint64_t_byteorder_swap(n)
 
 #endif
Index: kernel/arch/ppc32/include/byteorder.h
===================================================================
--- kernel/arch/ppc32/include/byteorder.h	(revision b84ce45da9a88a07aa08440a60c3520e28ffd2e2)
+++ kernel/arch/ppc32/include/byteorder.h	(revision b6e97d717db99cd0ea1752d7ad38b2d4d440fdd5)
@@ -38,6 +38,6 @@
 #include <byteorder.h>
 
-#define uint32_t_le2host(n)		uint64_t_byteorder_swap(n)
-#define uint64_t_le2host(n)		uint32_t_byteorder_swap(n)
+#define uint32_t_le2host(n)		uint32_t_byteorder_swap(n)
+#define uint64_t_le2host(n)		uint64_t_byteorder_swap(n)
 
 #define uint32_t_be2host(n)		(n)
Index: kernel/arch/ppc64/include/byteorder.h
===================================================================
--- kernel/arch/ppc64/include/byteorder.h	(revision b84ce45da9a88a07aa08440a60c3520e28ffd2e2)
+++ kernel/arch/ppc64/include/byteorder.h	(revision b6e97d717db99cd0ea1752d7ad38b2d4d440fdd5)
@@ -38,6 +38,6 @@
 #include <byteorder.h>
 
-#define uint32_t_le2host(n)		uint64_t_byteorder_swap(n)
-#define uint64_t_le2host(n)		uint32_t_byteorder_swap(n)
+#define uint32_t_le2host(n)		uint32_t_byteorder_swap(n)
+#define uint64_t_le2host(n)		uint64_t_byteorder_swap(n)
 
 #define uint32_t_be2host(n)		(n)