Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756350Ab2JETnB (ORCPT ); Fri, 5 Oct 2012 15:43:01 -0400 Received: from nm8.bullet.mail.sp2.yahoo.com ([98.139.91.78]:37418 "HELO nm8.bullet.mail.sp2.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751381Ab2JETm6 (ORCPT ); Fri, 5 Oct 2012 15:42:58 -0400 X-Yahoo-Newman-Id: 729405.93303.bm@omp1012.access.mail.sp2.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: xuIG2GoVM1mYLQw_ZXljAbyUi1WkC59S5N7M2HlXtOEF3e5 QoQRm6NpmaTTAO4bW9w428XMzBWVmB3jIBH0qPp6W_2SCWNnCc6NzBm9dfiA 6Jy74.8jWLW_2v8rqeZbPOR7gnLLhin0Mh3xeyh2.MXS8ob_Y8DYqo63rtmS nbGKB4.VHRmsYWXO4qFXaFpLK2KPfsQ6BBn.uiBKB1u.puZkLvV.MBjlxigq .9SisNEi0s5DFu0hMtZwWq5ChgBIO5CsjtnhLATnDDS5cPiPSKz3L7vuW6oi hqjphpISciR8HjyNV8M6BV5o4LrT8rq5XGhyJIR6M1RjeqdZ4Dimp7ttUDfb Xo02ExWJVU4VS4VAbikXAfmtfIEYfervfiMztrvCrkxPuLw_syx8NSxkm6i0 KxHMvbWcOhuYH_ngGDTWJH0eSXvhQTitFlvlzxOsqJwhqM0wueNiS6g-- X-Yahoo-SMTP: xXkkXk6swBBAi.5wfkIWFW3ugxbrqyhyk_b4Z25Sfu.XGQ-- From: danielfsantos@att.net To: LKML Cc: Andi Kleen , Andrea Arcangeli , Andrew Morton , Borislav Petkov , Christopher Li , David Daney , David Howells , David Rientjes , Joe Perches , Konstantin Khlebnikov , linux-sparse@vger.kernel.org, Michel Lespinasse , Paul Gortmaker , Pavel Pisa , Peter Zijlstra , Steven Rostedt , Daniel Santos Subject: [PATCH v2 01/10] compiler-gcc4.h: Reorder macros based upon gcc ver Date: Fri, 5 Oct 2012 14:42:40 -0500 Message-Id: <1349466169-20637-1-git-send-email-daniel.santos@pobox.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1349465759-20524-1-git-send-email-daniel.santos@pobox.com> References: <1349465759-20524-1-git-send-email-daniel.santos@pobox.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2245 Lines: 67 This helps to keep the file from getting confusing, removes one duplicate version check and should encourage future editors to put new macros where they belong. Signed-off-by: Daniel Santos Acked-by: David Rientjes --- include/linux/compiler-gcc4.h | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index 8721704..4506d65 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h @@ -13,6 +13,10 @@ #define __must_check __attribute__((warn_unused_result)) #define __compiler_offsetof(a,b) __builtin_offsetof(a,b) +#if __GNUC_MINOR__ > 0 +# define __compiletime_object_size(obj) __builtin_object_size(obj, 0) +#endif + #if __GNUC_MINOR__ >= 3 /* Mark functions as cold. gcc will assume any path leading to a call to them will be unlikely. This means a lot of manual unlikely()s @@ -31,6 +35,12 @@ #define __linktime_error(message) __attribute__((__error__(message))) +#ifndef __CHECKER__ +# define __compiletime_warning(message) __attribute__((warning(message))) +# define __compiletime_error(message) __attribute__((error(message))) +#endif /* __CHECKER__ */ +#endif /* __GNUC_MINOR__ >= 3 */ + #if __GNUC_MINOR__ >= 5 /* * Mark a position in code as unreachable. This can be used to @@ -46,8 +56,7 @@ /* Mark a function definition as prohibited from being cloned. */ #define __noclone __attribute__((__noclone__)) -#endif -#endif +#endif /* __GNUC_MINOR__ >= 5 */ #if __GNUC_MINOR__ >= 6 /* @@ -56,10 +65,3 @@ #define __visible __attribute__((externally_visible)) #endif -#if __GNUC_MINOR__ > 0 -#define __compiletime_object_size(obj) __builtin_object_size(obj, 0) -#endif -#if __GNUC_MINOR__ >= 3 && !defined(__CHECKER__) -#define __compiletime_warning(message) __attribute__((warning(message))) -#define __compiletime_error(message) __attribute__((error(message))) -#endif -- 1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/