diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-11-22 01:45:04 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-01-25 03:14:05 -0500 |
commit | 479e64c21038326f4fe429b4ffb7ea6d3175c2dc (patch) | |
tree | 420b7afecaa71d3c642600a271571dd48e998940 /include/linux/nls.h | |
parent | 36a7411724b1caf2fa92b5e4a41576ee8f16769e (diff) | |
download | linux-stable-479e64c21038326f4fe429b4ffb7ea6d3175c2dc.tar.gz linux-stable-479e64c21038326f4fe429b4ffb7ea6d3175c2dc.tar.bz2 linux-stable-479e64c21038326f4fe429b4ffb7ea6d3175c2dc.zip |
nls: have register_nls() set ->owner
pass owner explicitly to __register_nls(), make register_nls() a macro passing
THIS_MODULE as the owner argument to __register_nls().
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/nls.h')
-rw-r--r-- | include/linux/nls.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/nls.h b/include/linux/nls.h index 5dc635f8d79e..520681b68208 100644 --- a/include/linux/nls.h +++ b/include/linux/nls.h @@ -44,11 +44,12 @@ enum utf16_endian { }; /* nls_base.c */ -extern int register_nls(struct nls_table *); +extern int __register_nls(struct nls_table *, struct module *); extern int unregister_nls(struct nls_table *); extern struct nls_table *load_nls(char *); extern void unload_nls(struct nls_table *); extern struct nls_table *load_nls_default(void); +#define register_nls(nls) __register_nls((nls), THIS_MODULE) extern int utf8_to_utf32(const u8 *s, int len, unicode_t *pu); extern int utf32_to_utf8(unicode_t u, u8 *s, int maxlen); |