From patchwork Sun Nov 10 17:26:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 290073 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id D6FE32C009C for ; Mon, 11 Nov 2013 04:46:25 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CACDD4A579; Sun, 10 Nov 2013 18:46:15 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Tlx8Mi1+sqvH; Sun, 10 Nov 2013 18:46:15 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8DF854A5A9; Sun, 10 Nov 2013 18:44:13 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1FA884A58A for ; Sun, 10 Nov 2013 18:43:59 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dAnqvuAr3cTj for ; Sun, 10 Nov 2013 18:43:56 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-oa0-f73.google.com (mail-oa0-f73.google.com [209.85.219.73]) by theia.denx.de (Postfix) with ESMTPS id EDDC14A53B for ; Sun, 10 Nov 2013 18:43:31 +0100 (CET) Received: by mail-oa0-f73.google.com with SMTP id g12so554790oah.0 for ; Sun, 10 Nov 2013 09:43:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Z+5DpnRzy0E+DKRXt6oeLOIw/ixCoQZr3HspqtZ33YQ=; b=HzUjeIkM6niGnIn+ypf9L9P27Ches6xOe/l42QASDOocs7jAa50QGHCg1WaC4V2eLI 0f7WwNgvSqeQaDlIwl+qULxuV46YjzNnKzDv4TeWgcjMS78CkPwU2mA4eeDm2w/I9DqE 0Dlu7GzZlN7he02fFm3ZWkW1Wo/GU9m1VgtOo8zGPjGIMzL7tjVN63KVNTCGUQ5T6G99 dGCj8h+irxKNJh16OKaCXa4PlJWHZjqPWF5pN0+oHnQGr/P5QAZ+R5ORzmASy6bQTvIZ 8ICrSEGncNoH3qHHniX5SVZqPHe1S25YC8PRnn99BefYIe8uK7EkQEuzSnNk2zssdz4q nuZg== X-Gm-Message-State: ALoCoQkQCBP7DUyCDhq8kP1UEtgXPuRoblMwYTTTFt2S/LpClmQKj8TryxHxXYVX2I2XLTw7ifPimc6N9mS5URXM+H1N0y/vOZt0DodGXsXMlmvxzY5AeCjkhJ3Ro0SPa7Rk4v7h7UlUDAr67GfV4az3gWaEw6FkdFbwHJyF2bKpcZ56l/8GQae4rVgUbazGAGb7RjCo+QzZ X-Received: by 10.182.241.129 with SMTP id wi1mr8122349obc.10.1384105410183; Sun, 10 Nov 2013 09:43:30 -0800 (PST) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id t42si1417093yhm.3.2013.11.10.09.43.30 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 10 Nov 2013 09:43:30 -0800 (PST) Received: from kaki.bld.corp.google.com (kaki.bld.corp.google.com [172.29.216.32]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 0F62131C216; Sun, 10 Nov 2013 09:43:30 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id A4110221198; Sun, 10 Nov 2013 10:42:32 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sun, 10 Nov 2013 10:26:49 -0700 Message-Id: <1384104439-27026-4-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.8.4.1 In-Reply-To: <1384104439-27026-1-git-send-email-sjg@chromium.org> References: <1384104439-27026-1-git-send-email-sjg@chromium.org> Cc: u-boot-review@google.com Subject: [U-Boot] [PATCH 03/32] sandbox: Use uint64_t instead of u64 for time X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de The uint64_t type is defined in linux/types.h, so is safer than u64, which is not actually a Linux type. Signed-off-by: Simon Glass --- arch/sandbox/cpu/os.c | 3 ++- include/os.h | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index c4bdbb0..26f44cb 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -136,7 +137,7 @@ void os_usleep(unsigned long usec) usleep(usec); } -u64 __attribute__((no_instrument_function)) os_get_nsec(void) +uint64_t __attribute__((no_instrument_function)) os_get_nsec(void) { #if defined(CLOCK_MONOTONIC) && defined(_POSIX_MONOTONIC_CLOCK) struct timespec tp; diff --git a/include/os.h b/include/os.h index 8665f70..950433d 100644 --- a/include/os.h +++ b/include/os.h @@ -11,6 +11,8 @@ #ifndef __OS_H__ #define __OS_H__ +#include + struct sandbox_state; /** @@ -116,7 +118,7 @@ void os_usleep(unsigned long usec); * * \return A monotonic increasing time scaled in nano seconds */ -u64 os_get_nsec(void); +uint64_t os_get_nsec(void); /** * Parse arguments and update sandbox state.