Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932859Ab2JXQll (ORCPT ); Wed, 24 Oct 2012 12:41:41 -0400 Received: from nm12-vm0.access.bullet.mail.sp2.yahoo.com ([98.139.44.126]:44033 "EHLO nm12-vm0.access.bullet.mail.sp2.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935256Ab2JXQkH (ORCPT ); Wed, 24 Oct 2012 12:40:07 -0400 X-Yahoo-Newman-Id: 308485.79197.bm@smtp105.sbc.mail.gq1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: Oq9_brwVM1lD3O40xOQolVzI9gImCtw1fjOYV5Mmy5wdko0 HygpJ59c.T..RNEF1AO32TAa.VQitfdLTsZshPRoJQPmB4bErIOmi9fUmu_Z WP982X1BLptVaBIgZ8JZH8qYwr_AnfisC1TMqiGUpQMX0EtI6pjSWNsXfSKe oU0b8uUPcQ.M3CGWZ6czcLO.dB3Pbtt4E1QbFusdEaNOMwQF2e.tc6T06_9O RoZTRMhDclfQjz0FMDiCOS14kSO8I6JYAUND9nWL_pIaPcN3LVlpGROVvxKX cMFO5o2k70E0yC6L4lTRG2fuOkTl6vll2MM3UIRuBmIz2hrLeVvbQQCc0qr7 lpY2PuMIEXbJgd22Bs74VS_C1okycUA3dcVYlDgyAhzJtDDOdQc.obo.HkT3 x_7jh4vBib.Boab7MPMWiq05.rnpAyxSilkc8PdvpNQC1ij37eaUgsvNpJbJ kboQpN6ESGHyw2u_jKworBUYHwO7N5Q-- X-Yahoo-SMTP: xXkkXk6swBBAi.5wfkIWFW3ugxbrqyhyk_b4Z25Sfu.XGQ-- From: danielfsantos@att.net To: LKML , Andi Kleen , Andrea Arcangeli , Andrew Morton , Christopher Li , Daniel Santos , David Daney , David Howells , Joe Perches , Josh Triplett , Konstantin Khlebnikov , linux-sparse@vger.kernel.org, Michel Lespinasse , Paul Gortmaker , Pavel Pisa , Peter Zijlstra , Steven Rostedt , Borislav Petkov , David Rientjes Subject: [PATCH v3 01/10] compiler-gcc4.h: Reorder macros based upon gcc ver Date: Wed, 24 Oct 2012 11:33:52 -0500 Message-Id: <1351096441-12388-1-git-send-email-daniel.santos@pobox.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1351096132-12244-1-git-send-email-daniel.santos@pobox.com> References: <1351096132-12244-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 412bc6c..8914293 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/