From: James Bottomley <James.Bottomley@SteelEye.com>
To: Matt Domsch <Matt_Domsch@Dell.com>
Cc: Christoph Hellwig <hch@infradead.org>,
atulm@lsil.com, SCSI Mailing List <linux-scsi@vger.kernel.org>
Subject: Re: merge megaraid 2.20.x in kernel 2.6?
Date: 17 Aug 2004 12:58:53 -0400 [thread overview]
Message-ID: <1092761934.1775.326.camel@mulgrave> (raw)
In-Reply-To: <20040817165116.GD7127@lists.us.dell.com>
On Tue, 2004-08-17 at 12:51, Matt Domsch wrote:
> Not yet, that was one of the changes Atul requested he be allowed to
> make post-merge.
OK, this seems to be what fixes the COMPAT_IOCTL problem.
James
===== drivers/scsi/megaraid/megaraid_mm.c 1.1 vs edited =====
--- 1.1/drivers/scsi/megaraid/megaraid_mm.c 2004-06-23 14:36:31 -05:00
+++ edited/drivers/scsi/megaraid/megaraid_mm.c 2004-08-17 11:56:03 -05:00
@@ -1075,7 +1075,7 @@
/**
* mraid_mm_compat_ioctl : 32bit to 64bit ioctl conversion routine
*/
-#ifdef LSI_CONFIG_COMPAT
+#ifdef CONFIG_COMPAT
static int
mraid_mm_compat_ioctl(unsigned int fd, unsigned int cmd,
unsigned long arg, struct file *filep)
===== drivers/scsi/megaraid/megaraid_mm.h 1.1 vs edited =====
--- 1.1/drivers/scsi/megaraid/megaraid_mm.h 2004-06-23 10:53:53 -05:00
+++ edited/drivers/scsi/megaraid/megaraid_mm.h 2004-08-17 11:54:14 -05:00
@@ -41,18 +41,7 @@
/*
* Localizing ioctl32 differences
*/
-#if defined (CONFIG_COMPAT) || defined(__x86_64__) || defined(IA32_EMULATION)
-#if !defined(CONFIG_IA64)
-#define LSI_CONFIG_COMPAT
-#endif
-#endif
-
-#ifdef LSI_CONFIG_COMPAT
-#include <asm/ioctl32.h>
-#else
-#define register_ioctl32_conversion(a,b) do{}while(0)
-#define unregister_ioctl32_conversion(a) do{}while(0)
-#endif /* LSI_CONFIG_COMPAT */
+#include <linux/ioctl32.h>
/**
* mimd_t : Old style ioctl packet structure (deprecated)
@@ -137,7 +126,7 @@
static void mraid_mm_free_adp_resources(mraid_mmadp_t *);
static void mraid_mm_teardown_dma_pools(mraid_mmadp_t *);
-#ifdef LSI_CONFIG_COMPAT
+#ifdef CONFIG_COMPAT
static int mraid_mm_compat_ioctl(unsigned int, unsigned int, unsigned long,
struct file *);
#endif
next prev parent reply other threads:[~2004-08-17 16:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-08-17 16:01 merge megaraid 2.20.x in kernel 2.6? Matt Domsch
2004-08-17 16:40 ` James Bottomley
2004-08-17 16:47 ` Christoph Hellwig
2004-08-17 16:51 ` Matt Domsch
2004-08-17 16:58 ` James Bottomley [this message]
2004-08-17 17:06 ` Arjan van de Ven
-- strict thread matches above, loose matches on Subject: below --
2004-08-17 17:58 Mukker, Atul
2004-08-26 22:03 Mukker, Atul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1092761934.1775.326.camel@mulgrave \
--to=james.bottomley@steeleye.com \
--cc=Matt_Domsch@Dell.com \
--cc=atulm@lsil.com \
--cc=hch@infradead.org \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.