diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/obdclass/linux/linux-module.c')
| -rw-r--r-- | drivers/staging/lustre/lustre/obdclass/linux/linux-module.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c index 9ce3d36c685d..7eaaaa648dfb 100644 --- a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c +++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c @@ -58,10 +58,10 @@ #include <linux/poll.h> #include <linux/list.h> #include <linux/highmem.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/ioctls.h> -#include <asm/poll.h> -#include <asm/uaccess.h> +#include <linux/poll.h> +#include <linux/uaccess.h> #include <linux/miscdevice.h> #include <linux/seq_file.h> @@ -84,7 +84,7 @@ int obd_ioctl_getdata(char **buf, int *len, void *arg) int offset = 0; err = copy_from_user(&hdr, (void *)arg, sizeof(hdr)); - if ( err ) + if (err) return err; if (hdr.ioc_version != OBD_IOCTL_VERSION) { @@ -118,7 +118,7 @@ int obd_ioctl_getdata(char **buf, int *len, void *arg) data = (struct obd_ioctl_data *)*buf; err = copy_from_user(*buf, (void *)arg, hdr.ioc_len); - if ( err ) { + if (err) { OBD_FREE_LARGE(*buf, hdr.ioc_len); return err; } |