[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <45DF0EFA.3070706@redhat.com>
Date: Fri, 23 Feb 2007 16:57:46 +0100
From: Michal Schmidt <mschmidt@...hat.com>
To: linux-kernel@...r.kernel.org
Subject: [PATCH] Fix compilation of drivers with -O0
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
It is sometimes useful to compile individual drivers with optimization
disabled for easier debugging. Currently drivers which use htonl() and
similar functions don't compile with -O0. This patch fixes it.
It also removes obsolete and misleading comments. This header is not
for userspace, so we don't have to care about strange programs these
comments mention.
Signed-off-by: Michal Schmidt <mschmidt@...hat.com>
diff --git a/include/linux/byteorder/generic.h
b/include/linux/byteorder/generic.h
index e86e4a9..3dc715b 100644
- --- a/include/linux/byteorder/generic.h
+++ b/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 */
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with Red Hat - http://enigmail.mozdev.org
iD8DBQFF3w75abKV90ewf0QRAi+iAJ4g/NZXKdspLSi5wiRlzu5U0ytJFwCdEKD9
RUDYj69LURttm8qyCUCHz3k=
=73ft
-----END PGP SIGNATURE-----
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists