From patchwork Thu Feb 11 19:51:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8284841 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3D2179F38B for ; Thu, 11 Feb 2016 19:54:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6BB1B2034C for ; Thu, 11 Feb 2016 19:54:35 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8F0D820306 for ; Thu, 11 Feb 2016 19:54:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aTxHJ-0002uS-Sq; Thu, 11 Feb 2016 19:51:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aTxHI-0002uC-Hh for xen-devel@lists.xen.org; Thu, 11 Feb 2016 19:51:48 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id CD/7B-02745-356ECB65; Thu, 11 Feb 2016 19:51:47 +0000 X-Env-Sender: prvs=84296f867=Andrew.Cooper3@citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1455220305!14354794!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 53124 invoked from network); 11 Feb 2016 19:51:46 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-16.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 11 Feb 2016 19:51:46 -0000 X-IronPort-AV: E=Sophos;i="5.22,432,1449532800"; d="scan'208";a="331180602" From: Andrew Cooper To: Xen-devel Date: Thu, 11 Feb 2016 19:51:42 +0000 Message-ID: <1455220302-32685-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: Andrew Cooper , Tim Deegan , Ian Campbell , Jan Beulich Subject: [Xen-devel] [PATCH] xen/common: Uniformally use __ varients for attribute names X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Otherwise, debug code such as "void __attribute__((noreturn)) foobar()" fails to compile when the noreturn itself gets expanded, resulting in __attribute__((__attribute__((noreturn)))). No function change. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Tim Deegan CC: Ian Campbell --- xen/include/xen/compiler.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index 4b3472d..892455b 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -11,12 +11,12 @@ #define unlikely(x) __builtin_expect(!!(x),0) #define inline __inline__ -#define always_inline __inline__ __attribute__ ((always_inline)) -#define noinline __attribute__((noinline)) +#define always_inline __inline__ __attribute__ ((__always_inline__)) +#define noinline __attribute__((__noinline__)) -#define noreturn __attribute__((noreturn)) +#define noreturn __attribute__((__noreturn__)) -#define __packed __attribute__((packed)) +#define __packed __attribute__((__packed__)) #if (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)) #define unreachable() do {} while (1) @@ -43,7 +43,7 @@ #define __inline__ __inline__ __init #endif -#define __attribute_pure__ __attribute__((pure)) +#define __attribute_pure__ __attribute__((__pure__)) #define __attribute_const__ __attribute__((__const__)) /* @@ -60,7 +60,7 @@ #define __used __attribute__((__used__)) #define __maybe_unused __attribute__((__unused__)) -#define __must_check __attribute__((warn_unused_result)) +#define __must_check __attribute__((__warn_unused_result__)) #define offsetof(a,b) __builtin_offsetof(a,b)