Commit 30082bb8 authored by James Bottomley's avatar James Bottomley Committed by James Bottomley

Fix the new megaraid compat code to work on all 64 bit systems

make it universally include linux/ioctl32.h for
its compat ioctl.

This fixes a build failure on parisc64
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent a5a5e2d1
...@@ -1075,7 +1075,7 @@ mraid_mm_init(void) ...@@ -1075,7 +1075,7 @@ mraid_mm_init(void)
/** /**
* mraid_mm_compat_ioctl : 32bit to 64bit ioctl conversion routine * mraid_mm_compat_ioctl : 32bit to 64bit ioctl conversion routine
*/ */
#ifdef LSI_CONFIG_COMPAT #ifdef CONFIG_COMPAT
static int static int
mraid_mm_compat_ioctl(unsigned int fd, unsigned int cmd, mraid_mm_compat_ioctl(unsigned int fd, unsigned int cmd,
unsigned long arg, struct file *filep) unsigned long arg, struct file *filep)
......
...@@ -41,18 +41,7 @@ ...@@ -41,18 +41,7 @@
/* /*
* Localizing ioctl32 differences * Localizing ioctl32 differences
*/ */
#if defined (CONFIG_COMPAT) || defined(__x86_64__) || defined(IA32_EMULATION) #include <linux/ioctl32.h>
#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 */
/** /**
* mimd_t : Old style ioctl packet structure (deprecated) * mimd_t : Old style ioctl packet structure (deprecated)
...@@ -137,7 +126,7 @@ static int mraid_mm_setup_dma_pools(mraid_mmadp_t *); ...@@ -137,7 +126,7 @@ static int mraid_mm_setup_dma_pools(mraid_mmadp_t *);
static void mraid_mm_free_adp_resources(mraid_mmadp_t *); static void mraid_mm_free_adp_resources(mraid_mmadp_t *);
static void mraid_mm_teardown_dma_pools(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, static int mraid_mm_compat_ioctl(unsigned int, unsigned int, unsigned long,
struct file *); struct file *);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment