From: Greg Kroah-Hartman Date: Thu, 4 May 2017 23:03:25 +0000 (-0700) Subject: 3.18-stable patches X-Git-Tag: v3.18.52~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=beb85f00895743b16534951fc5fd2bbb84c783d5;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-stable patches added patches: message-i2o-fix-64bit-build-warnings.patch --- diff --git a/queue-3.18/message-i2o-fix-64bit-build-warnings.patch b/queue-3.18/message-i2o-fix-64bit-build-warnings.patch new file mode 100644 index 00000000000..a7e92fee8f0 --- /dev/null +++ b/queue-3.18/message-i2o-fix-64bit-build-warnings.patch @@ -0,0 +1,39 @@ +From foo@baz Thu May 4 16:01:53 PDT 2017 +Date: Thu, 04 May 2017 16:01:53 -0700 +To: Greg KH +From: Greg Kroah-Hartman +Subject: message: i2o: fix 64bit build warnings + +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", diff --git a/queue-3.18/series b/queue-3.18/series index 87b89f1e160..b6b414b3469 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -58,3 +58,4 @@ mips-jz4740-fix-build-error-in-irq.h.patch mips-elf2ecoff-ignore-pt_mips_abiflags-program-headers.patch mips-elf2ecoff-fix-warning-due-to-dead-code.patch staging-unisys-fix-build-warning-in-periodic_work.patch +message-i2o-fix-64bit-build-warnings.patch