From cf26d673829b06e02fb93e115c5c7611abf05be0 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 9 Aug 2010 17:20:18 -0700 Subject: [PATCH] --- yaml --- r: 207290 b: refs/heads/master c: ea6b101d8a3ea4e1dec29df31188c2f9852296fe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/compiler-gcc.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 566c85fa02d8..162490ec77db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7387be3373277005c171b9f1509e91fae2e430f3 +refs/heads/master: ea6b101d8a3ea4e1dec29df31188c2f9852296fe diff --git a/trunk/include/linux/compiler-gcc.h b/trunk/include/linux/compiler-gcc.h index 0da5b187f124..16508bcddacc 100644 --- a/trunk/include/linux/compiler-gcc.h +++ b/trunk/include/linux/compiler-gcc.h @@ -35,8 +35,7 @@ (typeof(ptr)) (__ptr + (off)); }) /* &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 __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) /* * Force always-inline if the user requests it so via the .config,