diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-25 13:21:06 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-25 13:21:06 +0100 |
| commit | 81cf65ff6fa1af7199001a61ce126e57b64ce98a (patch) | |
| tree | 71cce1dd8b8fd1e68ff8786dafd58fd2bec0b804 /crypto/proc.c | |
| parent | 02352a56e21d0f215000c4cbb474c2cac5309661 (diff) | |
| download | kernel_samsung_smdk4412-81cf65ff6fa1af7199001a61ce126e57b64ce98a.zip kernel_samsung_smdk4412-81cf65ff6fa1af7199001a61ce126e57b64ce98a.tar.gz kernel_samsung_smdk4412-81cf65ff6fa1af7199001a61ce126e57b64ce98a.tar.bz2 | |
crypto merged
Diffstat (limited to 'crypto/proc.c')
| -rw-r--r-- | crypto/proc.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/crypto/proc.c b/crypto/proc.c index 2c0b607..58fef67 100644 --- a/crypto/proc.c +++ b/crypto/proc.c @@ -25,7 +25,8 @@ #ifdef CONFIG_CRYPTO_FIPS static struct ctl_table crypto_sysctl_table[] = { { - .procname = "fips_status", + .procname = "fips_enabled", + .data = &fips_enabled, .maxlen = sizeof(int), .mode = 0444, .proc_handler = proc_dointvec @@ -140,20 +141,11 @@ static const struct file_operations proc_crypto_ops = { .release = seq_release }; -#ifdef CONFIG_CRYPTO_FIPS -void __init crypto_init_proc(int *fips_error) -{ - proc_create("crypto", 0, NULL, &proc_crypto_ops); - crypto_sysctl_table[0].data = fips_error; - crypto_proc_fips_init(); -} -#else void __init crypto_init_proc(void) { proc_create("crypto", 0, NULL, &proc_crypto_ops); crypto_proc_fips_init(); } -#endif void __exit crypto_exit_proc(void) { |