From patchwork Wed Oct 31 18:21:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alejandro Mery X-Patchwork-Id: 195991 X-Patchwork-Delegate: trini@ti.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 2CA5C2C0209 for ; Thu, 1 Nov 2012 06:52:19 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 311D64A44B; Wed, 31 Oct 2012 20:52:12 +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 Sz12fXEHVxhZ; Wed, 31 Oct 2012 20:52:12 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B02E14A44D; Wed, 31 Oct 2012 20:52:06 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D33A14A441 for ; Wed, 31 Oct 2012 19:21:23 +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 6Ju9vkVFaHVn for ; Wed, 31 Oct 2012 19:21:23 +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-ea0-f172.google.com (mail-ea0-f172.google.com [209.85.215.172]) by theia.denx.de (Postfix) with ESMTPS id 0E4904A440 for ; Wed, 31 Oct 2012 19:21:21 +0100 (CET) Received: by mail-ea0-f172.google.com with SMTP id k13so752485eaa.3 for ; Wed, 31 Oct 2012 11:21:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=t9YOM6FmZBNt2qj4LcmXPP6LjSvq5n7MMQn5vYG6toQ=; b=Ip+M6kZV8ynEOtHJe+IbjBVpz1IfVXvnnju3ceZi/UU81Wf+L43rDkXdRrDmmkOK/0 q14YwcDJInUGbjhqeELXiS9jTpmonYhy7DE0DdTuOt6MN0WvIkjeFqNcaBuJ6PKYA818 0EkUu9rWeaZ6bTXUW860zKrhKv9G9vCgTZciwKkRNjjgCF/8JSH8G2CJLuNCpwLuU5Wm 7IL1cqTWOX8QLr4Ss4ZzMcGl1/4MnABTpzymiQ7+QzPv8KXK/E+06dTG9l+AaPkD/qy4 feNCKghyOM5GVW7dyJXglzup+CuiUmfgTZBh1v1sU5+HrOpPZ8JSqZozEXn0XrozFR1q 3ZEw== Received: by 10.14.215.69 with SMTP id d45mr87696137eep.16.1351707680821; Wed, 31 Oct 2012 11:21:20 -0700 (PDT) Received: from localhost (crane.micrologic.net. [213.239.197.111]) by mx.google.com with ESMTPS id c6sm9318383eep.17.2012.10.31.11.21.19 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 11:21:20 -0700 (PDT) From: Alejandro Mery To: u-boot@lists.denx.de Date: Wed, 31 Oct 2012 19:21:33 +0100 Message-Id: <1351707693-7962-1-git-send-email-amery@geeks.cl> X-Mailer: git-send-email 1.7.12.3 X-Gm-Message-State: ALoCoQmBs9DlifUNDjy0zXDkQycpt7YK7ZKVnBe8qiOWsdYOWIG32ww2vE1bkATvYazwWp3c+jCu X-Mailman-Approved-At: Wed, 31 Oct 2012 20:52:05 +0100 Subject: [U-Boot] [PATCH] fs: zfs: fix illegal use of fp 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 upcoming sunxi (allwinner a10/a13) platform enables zfs by default, and using linaro's hf -msoft-float makes the build fail because this u64 division. Signed-off-by: Alejandro Mery Acked-by: Stefan Roese --- fs/zfs/zfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c index 360f723..ff857ae 100644 --- a/fs/zfs/zfs.c +++ b/fs/zfs/zfs.c @@ -30,6 +30,7 @@ #include #include #include "zfs_common.h" +#include "div64.h" block_dev_desc_t *zfs_dev_desc; @@ -2158,7 +2159,8 @@ zfs_read(zfs_file_t file, char *buf, uint64_t len) /* * Find requested blkid and the offset within that block. */ - uint64_t blkid = (file->offset + red) / blksz; + uint64_t blkid = file->offset + red; + blkid = do_div(blkid, blksz); free(data->file_buf); data->file_buf = 0;