From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755611Ab1HDWBB (ORCPT ); Thu, 4 Aug 2011 18:01:01 -0400 Received: from liberdade2.minaslivre.org ([74.50.53.203]:52147 "EHLO liberdade.minaslivre.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755746Ab1HDWAw (ORCPT ); Thu, 4 Aug 2011 18:00:52 -0400 From: Thadeu Lima de Souza Cascardo To: linux-next@vger.kernel.org Cc: Thadeu Lima de Souza Cascardo , Stephen Rothwell , Dan Magenheimer , Nitin Gupta , Greg KH , driverdevel , LKML Subject: [PATCH] zcache: Use div_u64 for 64-bit division Date: Thu, 4 Aug 2011 19:00:33 -0300 Message-Id: <1312495234-20961-1-git-send-email-cascardo@holoscopio.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <20110804145145.4af47989.rdunlap@xenotime.net> References: <20110804145145.4af47989.rdunlap@xenotime.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org xv_get_total_size_bytes returns a u64 value and it's used in a division. This causes build failures in 32-bit architectures, as reported by Randy Dunlap. Reported-by: Randy Dunlap Signed-off-by: Thadeu Lima de Souza Cascardo Cc: Stephen Rothwell Cc: Dan Magenheimer Cc: Nitin Gupta Cc: Greg KH Cc: driverdevel Cc: linux-next@vger.kernel.org Cc: LKML --- drivers/staging/zcache/zcache-main.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c index 66469ac..2c41c44 100644 --- a/drivers/staging/zcache/zcache-main.c +++ b/drivers/staging/zcache/zcache-main.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "tmem.h" #include "../zram/xvmalloc.h" /* if built in drivers/staging */ @@ -1162,6 +1163,7 @@ static void *zcache_pampd_create(char *data, size_t size, bool raw, int eph, uint16_t client_id = get_client_id_from_client(cli); unsigned long zv_mean_zsize; unsigned long curr_pers_pampd_count; + u64 total_zsize; if (eph) { ret = zcache_compress(page, &cdata, &clen); @@ -1194,8 +1196,9 @@ static void *zcache_pampd_create(char *data, size_t size, bool raw, int eph, } /* reject if mean compression is too poor */ if ((clen > zv_max_mean_zsize) && (curr_pers_pampd_count > 0)) { - zv_mean_zsize = xv_get_total_size_bytes(cli->xvpool) / - curr_pers_pampd_count; + total_zsize = xv_get_total_size_bytes(cli->xvpool); + zv_mean_zsize = div_u64(total_zsize, + curr_pers_pampd_count); if (zv_mean_zsize > zv_max_mean_zsize) { zcache_mean_compress_poor++; goto out; -- 1.7.5.4