diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-06-17 09:37:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-17 19:57:41 +0200 |
| commit | c0ee37e85e0e47402b8bbe35b6cec8e06937ca58 (patch) | |
| tree | 76c302de27669f5fe8d4494ce584379d7278c59d /arch/powerpc/lib/inst.c | |
| parent | maccess: rename probe_kernel_{read,write} to copy_{from,to}_kernel_nofault (diff) | |
| download | linux-c0ee37e85e0e47402b8bbe35b6cec8e06937ca58.tar.xz linux-c0ee37e85e0e47402b8bbe35b6cec8e06937ca58.zip | |
maccess: rename probe_user_{read,write} to copy_{from,to}_user_nofault
Better describe what these functions do.
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc/lib/inst.c')
| -rw-r--r-- | arch/powerpc/lib/inst.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/lib/inst.c b/arch/powerpc/lib/inst.c index 6c7a20af9fd6..9cc17eb62462 100644 --- a/arch/powerpc/lib/inst.c +++ b/arch/powerpc/lib/inst.c @@ -15,11 +15,11 @@ int probe_user_read_inst(struct ppc_inst *inst, unsigned int val, suffix; int err; - err = probe_user_read(&val, nip, sizeof(val)); + err = copy_from_user_nofault(&val, nip, sizeof(val)); if (err) return err; if (get_op(val) == OP_PREFIX) { - err = probe_user_read(&suffix, (void __user *)nip + 4, 4); + err = copy_from_user_nofault(&suffix, (void __user *)nip + 4, 4); *inst = ppc_inst_prefix(val, suffix); } else { *inst = ppc_inst(val); @@ -51,7 +51,7 @@ int probe_user_read_inst(struct ppc_inst *inst, unsigned int val; int err; - err = probe_user_read(&val, nip, sizeof(val)); + err = copy_from_user_nofault(&val, nip, sizeof(val)); if (!err) *inst = ppc_inst(val); |