LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [ PATCH 1/7 ] UML - Update UML definition of ARRAY_SIZE
@ 2007-03-22 16:06 Jeff Dike
  0 siblings, 0 replies; only message in thread
From: Jeff Dike @ 2007-03-22 16:06 UTC (permalink / raw)
  To: Andrew Morton; +Cc: LKML, uml-devel

This is the minimal change needed to keep UML building with the new
definition of ARRAY_SIZE.  It is defined in user_util.h so that
userspace files, which can't include kernel.h, can still use
ARRAY_SIZE.  However, since user_util.h is included everywhere,
including kernel files, the token sequence of the expansion has to
match.

This patch copies enough from the kernel headers to make that happen.

However, this is too gross to survive, and so is the entire header.
Future patches will make this header disappear, but this is a quick
and simple fix for the problem in case there is a noticable lag
between this patch and the more extensive patches which tidy this mess.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
--
 arch/um/include/user_util.h |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

Index: linux-2.6.21-mm/arch/um/include/user_util.h
===================================================================
--- linux-2.6.21-mm.orig/arch/um/include/user_util.h	2007-03-21 10:58:05.000000000 -0400
+++ linux-2.6.21-mm/arch/um/include/user_util.h	2007-03-21 11:05:44.000000000 -0400
@@ -8,8 +8,19 @@
 
 #include "sysdep/ptrace.h"
 
-/* Copied from kernel.h */
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+/* Copied from kernel.h and compiler-gcc.h */
+
+/* Force a compilation error if condition is true, but also produce a
+   result (of value 0 and type size_t), so the expression can be used
+   e.g. in a structure initializer (or where-ever else comma expressions
+   aren't permitted). */
+#define BUILD_BUG_ON_ZERO(e) (sizeof(char[1 - 2 * !!(e)]) - 1)
+
+/* &a[0] degrades to a pointer: a different type from an array */
+#define __must_be_array(a) \
+  BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(typeof(a), typeof(&a[0])))
+
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
 
 #define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR))
 

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2007-03-22 16:10 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-03-22 16:06 [ PATCH 1/7 ] UML - Update UML definition of ARRAY_SIZE Jeff Dike

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).