diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-24 11:46:01 -0800 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2018-11-29 17:49:05 +0100 |
| commit | 8588b01909e0145e5e84f5fe0a5353bd194f205c (patch) | |
| tree | 2b958cb2fca998ae9b0af4fe0e8528f2394df7f0 /block | |
| parent | abb6dd37b6fcb473e8974fac2e9c6cfbaa83b038 (diff) | |
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
This was entirely automated, using the script by Al:
PATT='^[[:blank:]]*#[[:blank:]]*include[[:blank:]]*<asm/uaccess.h>'
sed -i -e "s!$PATT!#include <linux/uaccess.h>!" \
$(git grep -l "$PATT"|grep -v ^include/linux/uaccess.h)
to do the replacement at the end of the merge window.
Requested-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Moyster <oysterized@gmail.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/ioctl.c | 2 | ||||
| -rw-r--r-- | block/partitions/ibm.c | 2 | ||||
| -rw-r--r-- | block/scsi_ioctl.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/block/ioctl.c b/block/ioctl.c index bb601f18d..7d4d47f82 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -7,7 +7,7 @@ #include <linux/backing-dev.h> #include <linux/fs.h> #include <linux/blktrace_api.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user *arg) { diff --git a/block/partitions/ibm.c b/block/partitions/ibm.c index 47a61474e..14b081af8 100644 --- a/block/partitions/ibm.c +++ b/block/partitions/ibm.c @@ -10,7 +10,7 @@ #include <linux/slab.h> #include <asm/dasd.h> #include <asm/ebcdic.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/vtoc.h> #include "check.h" diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 3a2530221..88ce34d5b 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -28,7 +28,7 @@ #include <linux/slab.h> #include <linux/times.h> #include <linux/uio.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <scsi/scsi.h> #include <scsi/scsi_ioctl.h> |