From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Leonard Subject: [PATCH ARM v5 14/20] mini-os: moved unlikely/likely macros to new compiler.h Date: Thu, 26 Jun 2014 12:28:31 +0100 Message-ID: <1403782117-15125-15-git-send-email-talex5@gmail.com> References: <1403782117-15125-1-git-send-email-talex5@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X07rb-0004TT-Ro for xen-devel@lists.xenproject.org; Thu, 26 Jun 2014 11:29:12 +0000 Received: by mail-we0-f172.google.com with SMTP id u57so3495856wes.31 for ; Thu, 26 Jun 2014 04:29:10 -0700 (PDT) In-Reply-To: <1403782117-15125-1-git-send-email-talex5@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Thomas Leonard , Dave.Scott@eu.citrix.com, anil@recoil.org, stefano.stabellini@eu.citrix.com, samuel.thibault@ens-lyon.org List-Id: xen-devel@lists.xenproject.org Requested by Julien Grall. Signed-off-by: Thomas Leonard --- extras/mini-os/include/compiler.h | 5 +++++ extras/mini-os/include/x86/os.h | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 extras/mini-os/include/compiler.h diff --git a/extras/mini-os/include/compiler.h b/extras/mini-os/include/compiler.h new file mode 100644 index 0000000..e35c9d5 --- /dev/null +++ b/extras/mini-os/include/compiler.h @@ -0,0 +1,5 @@ +#if __GNUC__ == 2 && __GNUC_MINOR__ < 96 +#define __builtin_expect(x, expected_value) (x) +#endif +#define unlikely(x) __builtin_expect((x),0) +#define likely(x) __builtin_expect((x),1) diff --git a/extras/mini-os/include/x86/os.h b/extras/mini-os/include/x86/os.h index 9e3f9bf..7a1bdc5 100644 --- a/extras/mini-os/include/x86/os.h +++ b/extras/mini-os/include/x86/os.h @@ -7,16 +7,11 @@ #ifndef _OS_H_ #define _OS_H_ -#if __GNUC__ == 2 && __GNUC_MINOR__ < 96 -#define __builtin_expect(x, expected_value) (x) -#endif -#define unlikely(x) __builtin_expect((x),0) -#define likely(x) __builtin_expect((x),1) - #define smp_processor_id() 0 #ifndef __ASSEMBLY__ +#include #include #include #include -- 2.0.0