From patchwork Mon Sep 26 03:34:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 674935 X-Patchwork-Delegate: bmeng.cn@gmail.com 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 3sj92S2PVgz9s5w for ; Mon, 26 Sep 2016 13:49:36 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=EGyN8VzE; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 71AFEB3852; Mon, 26 Sep 2016 05:43:49 +0200 (CEST) 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 Om6qfsUBv8rC; Mon, 26 Sep 2016 05:43:49 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EBB3CA777E; Mon, 26 Sep 2016 05:43:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 820BDA772F for ; Mon, 26 Sep 2016 05:43:24 +0200 (CEST) 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 GeQ0ffwaYCeF for ; Mon, 26 Sep 2016 05:43:24 +0200 (CEST) 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-it0-f41.google.com (mail-it0-f41.google.com [209.85.214.41]) by theia.denx.de (Postfix) with ESMTPS id 09E0BA7716 for ; Mon, 26 Sep 2016 05:43:20 +0200 (CEST) Received: by mail-it0-f41.google.com with SMTP id j69so33842722itb.0 for ; Sun, 25 Sep 2016 20:43:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=UBUQoOV813qcC+LWQW53DK9uyECgfvU8vRHauvoxWME=; b=EGyN8VzEIk/SuW0/tBzyybRL3QK+YSvIsf0wmDTVJkhB4w59jdr7gS7sC5Zroyo3L+ 4BQCEoGTRKYwmtmopeJ3Qxse+3PGQru6pWk7jChQQPoXqYzN0aRyFx6Y/RbTmwixZ+Bk g38yBLGWgZ87kndkBftcLVLjYCU4hxkfl8JwxO7fqkX4MMQDIGpqOohedsylXvE/0jxD 2s5CfV3JilrK5ReNHmfuduFBkHOIo1fdrWPjO0q3admng/kqo0x4TVkG6RBCtwao+PL6 3FkIsh6w7IZc/3Qy70Wp2N8u/6z9yKZuWO6CTvZvA+seCAmF24k0glIA6Z97XJqRTial HPrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=UBUQoOV813qcC+LWQW53DK9uyECgfvU8vRHauvoxWME=; b=eYtsRXXMUVi/gDMLQGw4grUjRlN1YPJDN5mbiGWoM9Ymf6h+gA25Sam+Pd6Dn/+wdo DNTOqLhBJ5FGj7lr06l6BDaKhVUI64B0k2d5xNPo9cys1rG2BIHJhUeXiIYFlqJ7hxRM GLCG9L4S8R+4n7IY1ftc6cWOQ877uV1YwV22dn6pbWQykTztwoWbMhCeagY6jKy/KKnk 68esN8mwmgyojzt+9En+X/Y3CjVQrOfGUQTFOaE3odGov+08x571GBqEk1N/Nl9R9QU6 1IHms/RhjbQ1nSuU8aaIrJ15hdokq7MkEYUUFNSSC/efHdvmeoyapZZ/Y66cv48sXUnR uHJA== X-Gm-Message-State: AA6/9Rm1DX3bi/zoBDdjcIypjglTqbtyzhmxOwhQPPzw/wR/siqw5h9lfVKQbBez9S3IPi/p X-Received: by 10.36.220.193 with SMTP id q184mr16541214itg.17.1474861399456; Sun, 25 Sep 2016 20:43:19 -0700 (PDT) Received: from kaki.bld.corp.google.com ([100.100.202.55]) by smtp.gmail.com with ESMTPSA id m127sm7543550ioe.32.2016.09.25.20.43.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Sep 2016 20:43:18 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id DAAF322270B; Sun, 25 Sep 2016 21:35:15 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 25 Sep 2016 21:34:03 -0600 Message-Id: <1474860866-16406-61-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1474860866-16406-1-git-send-email-sjg@chromium.org> References: <1474860866-16406-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH 60/82] x86: Fix up type sizes for 64-bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Adjust types as needed to support 64-bit compilation. Signed-off-by: Simon Glass --- arch/x86/include/asm/posix_types.h | 5 +++++ arch/x86/include/asm/types.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/arch/x86/include/asm/posix_types.h b/arch/x86/include/asm/posix_types.h index 5529f32..717f6cb 100644 --- a/arch/x86/include/asm/posix_types.h +++ b/arch/x86/include/asm/posix_types.h @@ -16,8 +16,13 @@ typedef int __kernel_pid_t; typedef unsigned short __kernel_ipc_pid_t; typedef unsigned short __kernel_uid_t; typedef unsigned short __kernel_gid_t; +#if CONFIG_IS_ENABLED(X86_64) +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +#else typedef unsigned int __kernel_size_t; typedef int __kernel_ssize_t; +#endif typedef int __kernel_ptrdiff_t; typedef long __kernel_time_t; typedef long __kernel_suseconds_t; diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h index 880dcb4..a47e581 100644 --- a/arch/x86/include/asm/types.h +++ b/arch/x86/include/asm/types.h @@ -44,7 +44,12 @@ typedef __INT64_TYPE__ s64; typedef __UINT64_TYPE__ u64; #endif +#if CONFIG_IS_ENABLED(X86_64) +#define BITS_PER_LONG 64 +#else #define BITS_PER_LONG 32 +#endif + /* Dma addresses are 32-bits wide. */ typedef u32 dma_addr_t;