From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754351AbdEESdz (ORCPT ); Fri, 5 May 2017 14:33:55 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:58678 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754043AbdEESdt (ORCPT ); Fri, 5 May 2017 14:33:49 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.18 61/68] message: i2o: fix 64bit build warnings Date: Fri, 5 May 2017 11:32:46 -0700 Message-Id: <20170505183215.009524647@linuxfoundation.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170505183212.587141964@linuxfoundation.org> References: <20170505183212.587141964@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman It seems that most of the 64bit build warnings were fixed up in this driver, but 2 were forgotten. This code is long deleted from newer kernels, so the fix is not needed there, but make it here in the 3.18 tree to keep the build quiet. Cc: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- drivers/message/i2o/i2o_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/message/i2o/i2o_config.c @@ -890,7 +890,7 @@ static int i2o_cfg_passthru(unsigned lon flag_count & 0x04000000 /*I2O_SGL_FLAGS_DIR */ ) { // TODO 64bit fix if (copy_from_user - (p->virt, (void __user *)sg[i].addr_bus, + (p->virt, (void __user *)(u64)sg[i].addr_bus, sg_size)) { printk(KERN_DEBUG "%s: Could not copy SG buf %d FROM user\n", @@ -950,7 +950,7 @@ static int i2o_cfg_passthru(unsigned lon sg_size = sg[j].flag_count & 0xffffff; // TODO 64bit fix if (copy_to_user - ((void __user *)sg[j].addr_bus, sg_list[j].virt, + ((void __user *)(u64)sg[j].addr_bus, sg_list[j].virt, sg_size)) { printk(KERN_WARNING "%s: Could not copy %p TO user %x\n",