From cc9afafcf33062d2f2347e83c3ff78a9ccd7ee5e Mon Sep 17 00:00:00 2001
From: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
Date: Tue, 8 May 2007 00:24:49 -0700
Subject: [PATCH] --- yaml --- r: 54559 b: refs/heads/master c:
 ee7b9e3706b9c5f90113eb16a1a84a1c01e09f95 h: refs/heads/master i:   54557:
 39bdb655fc8c8bcaeaba158d6f130a47442e43fc   54555:
 dc3007a53a7d1f3ada27568744c28138da313209   54551:
 d582bf966b7ebfa3a769b5a4c54c954ee3aa5ac2   54543:
 38b8a2c64f8633ee633e5c5e015414ab452bfce9   54527:
 56391923f1790c18ad9ebefb4ee983eb2806c5e1 v: v3

---
 [refs]                                  |  2 +-
 trunk/include/linux/byteorder/generic.h | 25 -------------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index 0c95f990903d..1a92ace366cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46595390e97b3ab2741a36f5ff69e8f6033fa9c0
+refs/heads/master: ee7b9e3706b9c5f90113eb16a1a84a1c01e09f95
diff --git a/trunk/include/linux/byteorder/generic.h b/trunk/include/linux/byteorder/generic.h
index e86e4a938373..3dc715b02500 100644
--- a/trunk/include/linux/byteorder/generic.h
+++ b/trunk/include/linux/byteorder/generic.h
@@ -124,19 +124,8 @@
 #define be32_to_cpus __be32_to_cpus
 #define cpu_to_be16s __cpu_to_be16s
 #define be16_to_cpus __be16_to_cpus
-#endif
 
-
-#if defined(__KERNEL__)
 /*
- * Handle ntohl and suches. These have various compatibility
- * issues - like we want to give the prototype even though we
- * also have a macro for them in case some strange program
- * wants to take the address of the thing or something..
- *
- * Note that these used to return a "long" in libc5, even though
- * long is often 64-bit these days.. Thus the casts.
- *
  * They have to be macros in order to do the constant folding
  * correctly - if the argument passed into a inline function
  * it is no longer constant according to gcc..
@@ -147,17 +136,6 @@
 #undef htonl
 #undef htons
 
-/*
- * Do the prototypes. Somebody might want to take the
- * address or some such sick thing..
- */
-extern __u32			ntohl(__be32);
-extern __be32			htonl(__u32);
-extern __u16			ntohs(__be16);
-extern __be16			htons(__u16);
-
-#if defined(__GNUC__) && defined(__OPTIMIZE__)
-
 #define ___htonl(x) __cpu_to_be32(x)
 #define ___htons(x) __cpu_to_be16(x)
 #define ___ntohl(x) __be32_to_cpu(x)
@@ -168,9 +146,6 @@ extern __be16			htons(__u16);
 #define htons(x) ___htons(x)
 #define ntohs(x) ___ntohs(x)
 
-#endif /* OPTIMIZE */
-
 #endif /* KERNEL */
 
-
 #endif /* _LINUX_BYTEORDER_GENERIC_H */