Merge branch 'mainline' into upstream-linus

1 files changed, 12 insertions, 1 deletions

diff --git a/crypto/proc.c b/crypto/proc.c
index c0a5dd7ce2cc..dabce0676f63 100644
--- a/crypto/proc.c
+++ b/crypto/proc.c
@@ -12,6 +12,8 @@
  * any later version.
  *
  */
+
+#include <asm/atomic.h>
 #include <linux/init.h>
 #include <linux/crypto.h>
 #include <linux/rwsem.h>
@@ -54,6 +56,7 @@ static int c_show(struct seq_file *m, void *p)
         seq_printf(m, "driver       : %s\n", alg->cra_driver_name);
         seq_printf(m, "module       : %s\n", module_name(alg->cra_module));
         seq_printf(m, "priority     : %d\n", alg->cra_priority);
+        seq_printf(m, "refcnt       : %d\n", atomic_read(&alg->cra_refcnt));
         
         switch (alg->cra_flags & CRYPTO_ALG_TYPE_MASK) {
         case CRYPTO_ALG_TYPE_CIPHER:
@@ -75,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;
         }
 
@@ -110,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);
+}