Skip to content

Commit 7c0f6ba

Browse files
torvaldstorvalds
committed
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>
1 parent 1dd5c6b commit 7c0f6ba

File tree

1,088 files changed

+1088
-1088
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,088 files changed

+1088
-1088
lines changed

‎arch/alpha/boot/misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <linux/kernel.h>
2222
#include <linux/slab.h>
2323

24-
#include <asm/uaccess.h>
24+
#include <linux/uaccess.h>
2525

2626
#define memzero(s,n) memset ((s),0,(n))
2727
#define puts srm_printk

‎arch/alpha/kernel/irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <linux/bitops.h>
2727

2828
#include <asm/io.h>
29-
#include <asm/uaccess.h>
29+
#include <linux/uaccess.h>
3030

3131
volatile unsigned long irq_err_count;
3232
DEFINE_PER_CPU(unsigned long, irq_pmi_count);

‎arch/alpha/kernel/osf_sys.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
#include <asm/fpu.h>
4141
#include <asm/io.h>
42-
#include <asm/uaccess.h>
42+
#include <linux/uaccess.h>
4343
#include <asm/sysinfo.h>
4444
#include <asm/thread_info.h>
4545
#include <asm/hwrpb.h>

‎arch/alpha/kernel/process.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <linux/rcupdate.h>
3232

3333
#include <asm/reg.h>
34-
#include <asm/uaccess.h>
34+
#include <linux/uaccess.h>
3535
#include <asm/io.h>
3636
#include <asm/pgtable.h>
3737
#include <asm/hwrpb.h>

‎arch/alpha/kernel/ptrace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <linux/tracehook.h>
1717
#include <linux/audit.h>
1818

19-
#include <asm/uaccess.h>
19+
#include <linux/uaccess.h>
2020
#include <asm/pgtable.h>
2121
#include <asm/fpu.h>
2222

‎arch/alpha/kernel/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static struct notifier_block alpha_panic_block = {
5353
INT_MAX /* try to do it first */
5454
};
5555

56-
#include <asm/uaccess.h>
56+
#include <linux/uaccess.h>
5757
#include <asm/pgtable.h>
5858
#include <asm/hwrpb.h>
5959
#include <asm/dma.h>

‎arch/alpha/kernel/signal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <linux/syscalls.h>
2323
#include <linux/tracehook.h>
2424

25-
#include <asm/uaccess.h>
25+
#include <linux/uaccess.h>
2626
#include <asm/sigcontext.h>
2727
#include <asm/ucontext.h>
2828

‎arch/alpha/kernel/srm_env.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include <linux/proc_fs.h>
3636
#include <linux/seq_file.h>
3737
#include <asm/console.h>
38-
#include <asm/uaccess.h>
38+
#include <linux/uaccess.h>
3939
#include <asm/machvec.h>
4040

4141
#define BASE_DIR "srm_environment" /* Subdir in /proc/ */

‎arch/alpha/kernel/srmcons.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <linux/tty_flip.h>
1919

2020
#include <asm/console.h>
21-
#include <asm/uaccess.h>
21+
#include <linux/uaccess.h>
2222

2323

2424
static DEFINE_SPINLOCK(srmcons_callback_lock);

‎arch/alpha/kernel/time.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include <linux/profile.h>
3535
#include <linux/irq_work.h>
3636

37-
#include <asm/uaccess.h>
37+
#include <linux/uaccess.h>
3838
#include <asm/io.h>
3939
#include <asm/hwrpb.h>
4040

‎arch/alpha/kernel/traps.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <linux/ratelimit.h>
1919

2020
#include <asm/gentrap.h>
21-
#include <asm/uaccess.h>
21+
#include <linux/uaccess.h>
2222
#include <asm/unaligned.h>
2323
#include <asm/sysinfo.h>
2424
#include <asm/hwrpb.h>

‎arch/alpha/lib/csum_partial_copy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <linux/types.h>
1313
#include <linux/string.h>
14-
#include <asm/uaccess.h>
14+
#include <linux/uaccess.h>
1515

1616

1717
#define ldq_u(x,y) \

‎arch/alpha/math-emu/math.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <linux/kernel.h>
44
#include <linux/sched.h>
55

6-
#include <asm/uaccess.h>
6+
#include <linux/uaccess.h>
77

88
#include "sfp-util.h"
99
#include <math-emu/soft-fp.h>

‎arch/alpha/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <linux/vmalloc.h>
2323
#include <linux/gfp.h>
2424

25-
#include <asm/uaccess.h>
25+
#include <linux/uaccess.h>
2626
#include <asm/pgtable.h>
2727
#include <asm/pgalloc.h>
2828
#include <asm/hwrpb.h>

‎arch/arm/common/bL_switcher_dummy_if.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/module.h>
1616
#include <linux/fs.h>
1717
#include <linux/miscdevice.h>
18-
#include <asm/uaccess.h>
18+
#include <linux/uaccess.h>
1919
#include <asm/bL_switcher.h>
2020

2121
static ssize_t bL_switcher_write(struct file *file, const char __user *buf,

‎arch/arm/kernel/swp_emulate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <asm/opcodes.h>
3030
#include <asm/system_info.h>
3131
#include <asm/traps.h>
32-
#include <asm/uaccess.h>
32+
#include <linux/uaccess.h>
3333

3434
/*
3535
* Error-checking SWP macros implemented using ldrex{b}/strex{b}

‎arch/arm/kvm/arm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#define CREATE_TRACE_POINTS
3434
#include "trace.h"
3535

36-
#include <asm/uaccess.h>
36+
#include <linux/uaccess.h>
3737
#include <asm/ptrace.h>
3838
#include <asm/mman.h>
3939
#include <asm/tlbflush.h>

‎arch/arm/kvm/guest.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <linux/vmalloc.h>
2424
#include <linux/fs.h>
2525
#include <asm/cputype.h>
26-
#include <asm/uaccess.h>
26+
#include <linux/uaccess.h>
2727
#include <asm/kvm.h>
2828
#include <asm/kvm_emulate.h>
2929
#include <asm/kvm_coproc.h>

‎arch/arm/mach-iop13xx/irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <linux/interrupt.h>
2121
#include <linux/list.h>
2222
#include <linux/sysctl.h>
23-
#include <asm/uaccess.h>
23+
#include <linux/uaccess.h>
2424
#include <asm/mach/irq.h>
2525
#include <asm/irq.h>
2626
#include <mach/hardware.h>

‎arch/arm/mach-ixp4xx/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include <mach/udc.h>
3535
#include <mach/hardware.h>
3636
#include <mach/io.h>
37-
#include <asm/uaccess.h>
37+
#include <linux/uaccess.h>
3838
#include <asm/pgtable.h>
3939
#include <asm/page.h>
4040
#include <asm/irq.h>

‎arch/arm/mach-rpc/dma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <asm/fiq.h>
2121
#include <asm/irq.h>
2222
#include <mach/hardware.h>
23-
#include <asm/uaccess.h>
23+
#include <linux/uaccess.h>
2424

2525
#include <asm/mach/dma.h>
2626
#include <asm/hardware/iomd.h>

‎arch/arm/plat-iop/time.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <linux/sched_clock.h>
2626
#include <mach/hardware.h>
2727
#include <asm/irq.h>
28-
#include <asm/uaccess.h>
28+
#include <linux/uaccess.h>
2929
#include <asm/mach/irq.h>
3030
#include <asm/mach/time.h>
3131
#include <mach/time.h>

‎arch/arm64/include/asm/word-at-a-time.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#ifndef __ASM_WORD_AT_A_TIME_H
1717
#define __ASM_WORD_AT_A_TIME_H
1818

19-
#include <asm/uaccess.h>
19+
#include <linux/uaccess.h>
2020

2121
#ifndef __AARCH64EB__
2222

‎arch/arm64/kernel/armv8_deprecated.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <asm/sysreg.h>
2020
#include <asm/system_misc.h>
2121
#include <asm/traps.h>
22-
#include <asm/uaccess.h>
22+
#include <linux/uaccess.h>
2323
#include <asm/cpufeature.h>
2424

2525
#define CREATE_TRACE_POINTS

‎arch/arm64/kernel/entry.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <asm/memory.h>
3232
#include <asm/ptrace.h>
3333
#include <asm/thread_info.h>
34-
#include <asm/uaccess.h>
34+
#include <linux/uaccess.h>
3535
#include <asm/unistd.h>
3636

3737
/*

‎arch/arm64/kernel/probes/kprobes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <asm/debug-monitors.h>
3030
#include <asm/system_misc.h>
3131
#include <asm/insn.h>
32-
#include <asm/uaccess.h>
32+
#include <linux/uaccess.h>
3333
#include <asm/irq.h>
3434
#include <asm/sections.h>
3535

‎arch/arm64/kernel/signal32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <asm/esr.h>
2727
#include <asm/fpsimd.h>
2828
#include <asm/signal32.h>
29-
#include <asm/uaccess.h>
29+
#include <linux/uaccess.h>
3030
#include <asm/unistd.h>
3131

3232
struct compat_sigcontext {

‎arch/arm64/kvm/guest.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <linux/vmalloc.h>
2727
#include <linux/fs.h>
2828
#include <asm/cputype.h>
29-
#include <asm/uaccess.h>
29+
#include <linux/uaccess.h>
3030
#include <asm/kvm.h>
3131
#include <asm/kvm_emulate.h>
3232
#include <asm/kvm_coproc.h>

‎arch/arm64/lib/clear_user.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
#include <linux/linkage.h>
1919

20-
#include <asm/uaccess.h>
20+
#include <linux/uaccess.h>
2121

2222
.text
2323

‎arch/arm64/lib/copy_from_user.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <linux/linkage.h>
1818

1919
#include <asm/cache.h>
20-
#include <asm/uaccess.h>
20+
#include <linux/uaccess.h>
2121

2222
/*
2323
* Copy from user space to a kernel buffer (alignment handled by the hardware)

‎arch/arm64/lib/copy_in_user.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <linux/linkage.h>
2020

2121
#include <asm/cache.h>
22-
#include <asm/uaccess.h>
22+
#include <linux/uaccess.h>
2323

2424
/*
2525
* Copy from user space to user space (alignment handled by the hardware)

‎arch/arm64/lib/copy_to_user.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <linux/linkage.h>
1818

1919
#include <asm/cache.h>
20-
#include <asm/uaccess.h>
20+
#include <linux/uaccess.h>
2121

2222
/*
2323
* Copy to user space from a kernel buffer (alignment handled by the hardware)

‎arch/arm64/mm/cache.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <asm/assembler.h>
2424
#include <asm/cpufeature.h>
2525
#include <asm/alternative.h>
26-
#include <asm/uaccess.h>
26+
#include <linux/uaccess.h>
2727

2828
/*
2929
* flush_icache_range(start,end)

‎arch/arm64/xen/hypercall.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
#include <linux/linkage.h>
5151
#include <asm/assembler.h>
52-
#include <asm/uaccess.h>
52+
#include <linux/uaccess.h>
5353
#include <xen/interface/xen.h>
5454

5555

‎arch/avr32/kernel/avr32_ksyms.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <linux/module.h>
1313

1414
#include <asm/checksum.h>
15-
#include <asm/uaccess.h>
15+
#include <linux/uaccess.h>
1616

1717
/*
1818
* GCC functions

‎arch/avr32/kernel/ptrace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <linux/notifier.h>
1818

1919
#include <asm/traps.h>
20-
#include <asm/uaccess.h>
20+
#include <linux/uaccess.h>
2121
#include <asm/ocd.h>
2222
#include <asm/mmu_context.h>
2323
#include <linux/kdebug.h>

‎arch/avr32/kernel/signal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <linux/unistd.h>
1818
#include <linux/tracehook.h>
1919

20-
#include <asm/uaccess.h>
20+
#include <linux/uaccess.h>
2121
#include <asm/ucontext.h>
2222
#include <asm/syscalls.h>
2323

‎arch/avr32/mm/cache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <asm/cacheflush.h>
1313
#include <asm/cachectl.h>
1414
#include <asm/processor.h>
15-
#include <asm/uaccess.h>
15+
#include <linux/uaccess.h>
1616
#include <asm/syscalls.h>
1717

1818
/*

‎arch/blackfin/kernel/bfin_dma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <asm/blackfin.h>
2020
#include <asm/cacheflush.h>
2121
#include <asm/dma.h>
22-
#include <asm/uaccess.h>
22+
#include <linux/uaccess.h>
2323
#include <asm/early_printk.h>
2424

2525
/*

‎arch/blackfin/kernel/kgdb_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <linux/proc_fs.h>
1313

1414
#include <asm/current.h>
15-
#include <asm/uaccess.h>
15+
#include <linux/uaccess.h>
1616

1717
#include <asm/blackfin.h>
1818

‎arch/blackfin/kernel/module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/kernel.h>
1515
#include <asm/dma.h>
1616
#include <asm/cacheflush.h>
17-
#include <asm/uaccess.h>
17+
#include <linux/uaccess.h>
1818

1919
/* Transfer the section to the L1 memory */
2020
int

‎arch/c6x/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <linux/initrd.h>
1919

2020
#include <asm/sections.h>
21-
#include <asm/uaccess.h>
21+
#include <linux/uaccess.h>
2222

2323
/*
2424
* ZERO_PAGE is a special page that is used for zero-initialized

‎arch/cris/arch-v10/drivers/eeprom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <linux/delay.h>
3030
#include <linux/interrupt.h>
3131
#include <linux/wait.h>
32-
#include <asm/uaccess.h>
32+
#include <linux/uaccess.h>
3333
#include "i2c.h"
3434

3535
#define D(x)

‎arch/cris/arch-v10/drivers/sync_serial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <asm/dma.h>
2828
#include <asm/io.h>
2929
#include <arch/svinto.h>
30-
#include <asm/uaccess.h>
30+
#include <linux/uaccess.h>
3131
#include <asm/sync_serial.h>
3232
#include <arch/io_interface_mux.h>
3333

0 commit comments

Comments
 (0)