Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261333AbVDUMlt (ORCPT ); Thu, 21 Apr 2005 08:41:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261335AbVDUMlt (ORCPT ); Thu, 21 Apr 2005 08:41:49 -0400 Received: from mtagate4.de.ibm.com ([195.212.29.153]:34981 "EHLO mtagate4.de.ibm.com") by vger.kernel.org with ESMTP id S261333AbVDUMlm (ORCPT ); Thu, 21 Apr 2005 08:41:42 -0400 Date: Thu, 21 Apr 2005 14:42:32 +0200 From: Andreas Herrmann To: Jan Dittmer , James Bottomley Cc: Linux SCSI , Linux Kernel Subject: [PATCH] zfcp: fix compile error Message-ID: <20050421124232.GA27754@lion28.boeblingen.de.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.8i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2038 Lines: 57 Jan Dittmer wrote: 21.04.2005 10:49 > > aherrman@de.ibm.com: > > [PATCH] zfcp: convert to compat_ioctl > This does not seem to compile anymore with defconfig: > CC drivers/s390/scsi/zfcp_aux.o > /usr/src/ctest/rc/kernel/drivers/s390/scsi/zfcp_aux.c:63: warning: initialization from incompatible pointer type > /usr/src/ctest/rc/kernel/drivers/s390/scsi/zfcp_aux.c:366: error: conflicting types for `zfcp_cfdc_dev_ioctl' Oops. Submitted patch was incorrect. Attached patch (against 2.6.12-rc3) will fix the problem. Sorry, for any inconvenience. Regards, Andreas zfcp: fix compile error Signed-off-by: Andreas Herrmann diff -bBrauN linux-2.6.x/drivers/s390/scsi-orig/zfcp_aux.c linux-2.6.x/drivers/s390/scsi/zfcp_aux.c --- linux-2.6.x/drivers/s390/scsi-orig/zfcp_aux.c 2005-04-21 12:36:44.000000000 +0200 +++ linux-2.6.x/drivers/s390/scsi/zfcp_aux.c 2005-04-21 12:40:48.000000000 +0200 @@ -52,7 +52,7 @@ static inline int zfcp_sg_list_copy_to_user(void __user *, struct zfcp_sg_list *, size_t); -static int zfcp_cfdc_dev_ioctl(struct file *, unsigned int, unsigned long); +static long zfcp_cfdc_dev_ioctl(struct file *, unsigned int, unsigned long); #define ZFCP_CFDC_IOC_MAGIC 0xDD #define ZFCP_CFDC_IOC \ diff -bBrauN linux-2.6.x/drivers/s390/scsi-orig/zfcp_def.h linux-2.6.x/drivers/s390/scsi/zfcp_def.h --- linux-2.6.x/drivers/s390/scsi-orig/zfcp_def.h 2005-04-21 12:36:44.000000000 +0200 +++ linux-2.6.x/drivers/s390/scsi/zfcp_def.h 2005-04-21 12:41:56.000000000 +0200 @@ -61,7 +61,6 @@ #include #include #include -#include /************************ DEBUG FLAGS *****************************************/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/