Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f6259deacfd55607ae57cff422d3bc7694ea14e7
Commit:     f6259deacfd55607ae57cff422d3bc7694ea14e7
Parent:     e196d6259141eda47aeafd88514aae652bfbfc7f
Author:     Simon Arlott <[EMAIL PROTECTED]>
AuthorDate: Wed May 2 22:08:26 2007 +1000
Committer:  Herbert Xu <[EMAIL PROTECTED]>
CommitDate: Wed May 2 22:08:26 2007 +1000

    [CRYPTO] padlock: Remove pointless padlock module
    
    When this is compiled in it is run too early to do anything useful:
    [    6.052000] padlock: No VIA PadLock drivers have been loaded.
    [    6.052000] padlock: Using VIA PadLock ACE for AES algorithm.
    [    6.052000] padlock: Using VIA PadLock ACE for SHA1/SHA256 algorithms.
    
    When it's a module it isn't doing anything special, the same functionality
    can be provided in userspace by "probeall padlock padlock-aes padlock-sha"
    in modules.conf if it is required.
    
    Signed-off-by: Simon Arlott <[EMAIL PROTECTED]>
    Cc: Michal Ludvig <[EMAIL PROTECTED]>
    Signed-off-by: Herbert Xu <[EMAIL PROTECTED]>
---
 drivers/crypto/Kconfig   |   16 ++----------
 drivers/crypto/Makefile  |    1 -
 drivers/crypto/padlock.c |   58 ----------------------------------------------
 3 files changed, 3 insertions(+), 72 deletions(-)

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ff8c4be..f21fe66 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -1,10 +1,10 @@
 menu "Hardware crypto devices"
 
 config CRYPTO_DEV_PADLOCK
-       tristate "Support for VIA PadLock ACE"
+       bool "Support for VIA PadLock ACE"
        depends on X86_32
        select CRYPTO_ALGAPI
-       default m
+       default y
        help
          Some VIA processors come with an integrated crypto engine
          (so called VIA PadLock ACE, Advanced Cryptography Engine)
@@ -14,16 +14,6 @@ config CRYPTO_DEV_PADLOCK
          The instructions are used only when the CPU supports them.
          Otherwise software encryption is used.
 
-         Selecting M for this option will compile a helper module
-         padlock.ko that should autoload all below configured
-         algorithms. Don't worry if your hardware does not support
-         some or all of them. In such case padlock.ko will
-         simply write a single line into the kernel log informing
-         about its failure but everything will keep working fine.
-
-         If you are unsure, say M. The compiled module will be
-         called padlock.ko
-
 config CRYPTO_DEV_PADLOCK_AES
        tristate "PadLock driver for AES algorithm"
        depends on CRYPTO_DEV_PADLOCK
@@ -55,7 +45,7 @@ source "arch/s390/crypto/Kconfig"
 
 config CRYPTO_DEV_GEODE
        tristate "Support for the Geode LX AES engine"
-       depends on CRYPTO && X86_32 && PCI
+       depends on X86_32 && PCI
        select CRYPTO_ALGAPI
        select CRYPTO_BLKCIPHER
        default m
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 6059cf8..d070030 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -1,4 +1,3 @@
-obj-$(CONFIG_CRYPTO_DEV_PADLOCK) += padlock.o
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
 obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
diff --git a/drivers/crypto/padlock.c b/drivers/crypto/padlock.c
deleted file mode 100644
index d6d7dd5..0000000
--- a/drivers/crypto/padlock.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Cryptographic API.
- *
- * Support for VIA PadLock hardware crypto engine.
- *
- * Copyright (c) 2006  Michal Ludvig <[EMAIL PROTECTED]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/crypto.h>
-#include <linux/cryptohash.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/scatterlist.h>
-#include "padlock.h"
-
-static int __init padlock_init(void)
-{
-       int success = 0;
-
-       if (crypto_has_cipher("aes-padlock", 0, 0))
-               success++;
-
-       if (crypto_has_hash("sha1-padlock", 0, 0))
-               success++;
-
-       if (crypto_has_hash("sha256-padlock", 0, 0))
-               success++;
-
-       if (!success) {
-               printk(KERN_WARNING PFX "No VIA PadLock drivers have been 
loaded.\n");
-               return -ENODEV;
-       }
-
-       printk(KERN_NOTICE PFX "%d drivers are available.\n", success);
-
-       return 0;
-}
-
-static void __exit padlock_fini(void)
-{
-}
-
-module_init(padlock_init);
-module_exit(padlock_fini);
-
-MODULE_DESCRIPTION("Load all configured PadLock algorithms.");
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Michal Ludvig");
-
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to