path: root/arch/csky
diff options
authorLinus Torvalds <>2021-05-02 09:14:01 -0700
committerLinus Torvalds <>2021-05-02 09:14:01 -0700
commit27787ba3fa4904422b3928b898d1bd3d74d98bea (patch)
tree72fce8989a8214f927f3afccaa39d11de38ccb59 /arch/csky
parentb28866f4bb77095c262dfd5783197b691c624fa6 (diff)
parent80e5d1ff5d5f1ed5167a69b7c2fe86071b615f6b (diff)
Merge branch 'work.misc' of git://
Pull misc vfs updates from Al Viro: "Assorted stuff all over the place" * 'work.misc' of git:// useful constants: struct qstr for ".." hostfs_open(): don't open-code file_dentry() whack-a-mole: kill strlen_user() (again) autofs: should_expire() argument is guaranteed to be positive apparmor:match_mn() - constify devpath argument buffer: a small optimization in grow_buffers get rid of autofs_getpath() constify dentry argument of dentry_path()/dentry_path_raw()
Diffstat (limited to 'arch/csky')
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/csky/include/asm/uaccess.h b/arch/csky/include/asm/uaccess.h
index 3dec272e1fa3..4216a2a9415c 100644
--- a/arch/csky/include/asm/uaccess.h
+++ b/arch/csky/include/asm/uaccess.h
@@ -397,8 +397,6 @@ long __strncpy_from_user(char *dst, const char *src, long count);
long strnlen_user(const char *src, long n);
-#define strlen_user(str) strnlen_user(str, 32767)
struct exception_table_entry {
unsigned long insn;
unsigned long nextinsn;
diff --git a/arch/csky/lib/usercopy.c b/arch/csky/lib/usercopy.c
index 3c9bd645e643..f45b707f059f 100644
--- a/arch/csky/lib/usercopy.c
+++ b/arch/csky/lib/usercopy.c
@@ -116,7 +116,7 @@ long strncpy_from_user(char *dst, const char *src, long count)
- * strlen_user: - Get the size of a string in user space.
+ * strnlen_user: - Get the size of a string in user space.
* @str: The string to measure.
* @n: The maximum valid length