diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-09 10:28:40 +0200 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-10-17 02:38:36 +1100 |
| commit | 5f4123be3cdb1dbd77fa9d6d2bb96bb9689a0a19 (patch) | |
| tree | e636c2ae7d5a5459f4f4625d44754737f45a984f /fs/nls | |
| parent | a65e5d782f9db2a61a914dc01a329e0c2dcf92a1 (diff) | |
| download | kernel-crypto-5f4123be3cdb1dbd77fa9d6d2bb96bb9689a0a19.tar.gz kernel-crypto-5f4123be3cdb1dbd77fa9d6d2bb96bb9689a0a19.tar.xz kernel-crypto-5f4123be3cdb1dbd77fa9d6d2bb96bb9689a0a19.zip | |
remove CONFIG_KMOD from fs
Just always compile the code when the kernel is modular.
Convert load_nls to use try_then_request_module to tidy
up the code.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'fs/nls')
| -rw-r--r-- | fs/nls/nls_base.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c index 64965e1c21c..9b0efdad891 100644 --- a/fs/nls/nls_base.c +++ b/fs/nls/nls_base.c @@ -13,9 +13,7 @@ #include <linux/nls.h> #include <linux/kernel.h> #include <linux/errno.h> -#ifdef CONFIG_KMOD #include <linux/kmod.h> -#endif #include <linux/spinlock.h> static struct nls_table default_table; @@ -215,24 +213,7 @@ static struct nls_table *find_nls(char *charset) struct nls_table *load_nls(char *charset) { - struct nls_table *nls; -#ifdef CONFIG_KMOD - int ret; -#endif - - nls = find_nls(charset); - if (nls) - return nls; - -#ifdef CONFIG_KMOD - ret = request_module("nls_%s", charset); - if (ret != 0) { - printk("Unable to load NLS charset %s\n", charset); - return NULL; - } - nls = find_nls(charset); -#endif - return nls; + return try_then_request_module(find_nls(charset), "nls_%s", charset); } void unload_nls(struct nls_table *nls) |