Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-drm-fsl-dcu.git] / crypto / proc.c

diff --git a/crypto/proc.c b/crypto/proc.c
index 8543b7a157d6a8a77069f11b2aed5c0d8cc1f9f2..102c751a124c1d0368b9c7e9d8b1c421181e7667 100644 (file)
--- a/crypto/proc.c
+++ b/crypto/proc.c
@@ -78,7 +78,10 @@ static int c_show(struct seq_file *m, void *p)
                seq_printf(m, "type         : compression\n");
                break;
        default:
-               seq_printf(m, "type         : unknown\n");
+               if (alg->cra_type && alg->cra_type->show)
+                       alg->cra_type->show(m, alg);
+               else
+                       seq_printf(m, "type         : unknown\n");
                break;
        }
 
@@ -98,7 +101,7 @@ static int crypto_info_open(struct inode *inode, struct file *file)
        return seq_open(file, &crypto_seq_ops);
 }
         
-static struct file_operations proc_crypto_ops = {
+static const struct file_operations proc_crypto_ops = {
        .open           = crypto_info_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
@@ -113,3 +116,8 @@ void __init crypto_init_proc(void)
        if (proc)
                proc->proc_fops = &proc_crypto_ops;
 }
+
+void __exit crypto_exit_proc(void)
+{
+       remove_proc_entry("crypto", NULL);
+}