diff options
author | Miloslav Trmač <mitr@redhat.com> | 2010-08-08 02:47:26 +0200 |
---|---|---|
committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-08 02:47:26 +0200 |
commit | ca1f42282167031868fc1b72512c2d5c49bceb99 (patch) | |
tree | 174862541920512f4798e66a465b2bd88cc6753a /crypto | |
parent | e7f1c4b12cbb143e9b6d1cdd0f1ec9a7725b4cac (diff) | |
parent | d465b18ea8d04ae3fce2e27016de8d3cdcc571e2 (diff) | |
download | kernel-crypto-ca1f42282167031868fc1b72512c2d5c49bceb99.tar.gz kernel-crypto-ca1f42282167031868fc1b72512c2d5c49bceb99.tar.xz kernel-crypto-ca1f42282167031868fc1b72512c2d5c49bceb99.zip |
Merge branch 'standalone-rename' into userspace-crypto
Conflicts:
crypto/userspace/cryptodev_main.c
crypto/userspace/ncr-dh.c
crypto/userspace/ncr-key-storage.c
crypto/userspace/ncr-key-wrap.c
crypto/userspace/ncr-key.c
crypto/userspace/ncr-pk.c
crypto/userspace/ncr-sessions.c
crypto/userspace/ncr.c
include/linux/cryptodev.h
include/linux/ncr.h
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/userspace/cryptodev_cipher.c | 4 | ||||
-rw-r--r-- | crypto/userspace/cryptodev_main.c | 7 | ||||
-rw-r--r-- | crypto/userspace/ncr-dh.c | 5 | ||||
-rw-r--r-- | crypto/userspace/ncr-int.h | 2 | ||||
-rw-r--r-- | crypto/userspace/ncr-key-storage.c | 5 | ||||
-rw-r--r-- | crypto/userspace/ncr-key-wrap.c | 5 | ||||
-rw-r--r-- | crypto/userspace/ncr-key.c | 5 | ||||
-rw-r--r-- | crypto/userspace/ncr-pk.c | 5 | ||||
-rw-r--r-- | crypto/userspace/ncr-sessions.c | 12 | ||||
-rw-r--r-- | crypto/userspace/ncr.c | 5 |
10 files changed, 24 insertions, 31 deletions
diff --git a/crypto/userspace/cryptodev_cipher.c b/crypto/userspace/cryptodev_cipher.c index 00fa76391fe..8a003c5613a 100644 --- a/crypto/userspace/cryptodev_cipher.c +++ b/crypto/userspace/cryptodev_cipher.c @@ -26,10 +26,10 @@ #include <linux/cryptodev.h> #include <linux/mm.h> #include <linux/highmem.h> +#include <linux/ioctl.h> #include <linux/random.h> -#include <asm/uaccess.h> -#include <asm/ioctl.h> #include <linux/scatterlist.h> +#include <linux/uaccess.h> #include <crypto/algapi.h> #include <crypto/hash.h> #include "cryptodev_int.h" diff --git a/crypto/userspace/cryptodev_main.c b/crypto/userspace/cryptodev_main.c index 1e64120547a..a56d845f897 100644 --- a/crypto/userspace/cryptodev_main.c +++ b/crypto/userspace/cryptodev_main.c @@ -32,14 +32,13 @@ */ #include <linux/crypto.h> -#include <linux/cryptodev.h> #include <linux/mm.h> #include <linux/highmem.h> +#include <linux/ioctl.h> #include <linux/random.h> #include <linux/syscalls.h> #include <linux/pagemap.h> -#include <asm/uaccess.h> -#include <asm/ioctl.h> +#include <linux/uaccess.h> #include <linux/scatterlist.h> #include "cryptodev_int.h" #include "ncr-int.h" @@ -950,7 +949,7 @@ cryptodev_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg_) #endif /* CONFIG_COMPAT */ -static struct file_operations cryptodev_fops = { +static const struct file_operations cryptodev_fops = { .owner = THIS_MODULE, .open = cryptodev_open, .release = cryptodev_release, diff --git a/crypto/userspace/ncr-dh.c b/crypto/userspace/ncr-dh.c index c1851581269..3a00c0bbc38 100644 --- a/crypto/userspace/ncr-dh.c +++ b/crypto/userspace/ncr-dh.c @@ -22,13 +22,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <linux/cryptodev.h> +#include <linux/ioctl.h> #include <linux/mm.h> #include <linux/ncr.h> #include <linux/slab.h> #include <linux/random.h> -#include <asm/uaccess.h> -#include <asm/ioctl.h> +#include <linux/uaccess.h> #include <linux/scatterlist.h> #include <ncr-int.h> #include <tomcrypt.h> diff --git a/crypto/userspace/ncr-int.h b/crypto/userspace/ncr-int.h index c93bf4d8290..fdc0200a931 100644 --- a/crypto/userspace/ncr-int.h +++ b/crypto/userspace/ncr-int.h @@ -48,7 +48,7 @@ struct session_item_st { struct page **pages; unsigned array_size; unsigned available_pages; - struct semaphore mem_mutex; /* down when the + struct mutex mem_mutex; /* down when the * values above are changed. */ diff --git a/crypto/userspace/ncr-key-storage.c b/crypto/userspace/ncr-key-storage.c index c97b80c7042..0db4eeddfff 100644 --- a/crypto/userspace/ncr-key-storage.c +++ b/crypto/userspace/ncr-key-storage.c @@ -22,12 +22,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <linux/cryptodev.h> +#include <linux/ioctl.h> #include <linux/mm.h> #include <linux/ncr.h> #include <linux/slab.h> -#include <asm/uaccess.h> -#include <asm/ioctl.h> +#include <linux/uaccess.h> #include <linux/scatterlist.h> #include "ncr-int.h" #include "cryptodev_int.h" diff --git a/crypto/userspace/ncr-key-wrap.c b/crypto/userspace/ncr-key-wrap.c index f2b3b6130b1..e36a7db0080 100644 --- a/crypto/userspace/ncr-key-wrap.c +++ b/crypto/userspace/ncr-key-wrap.c @@ -22,14 +22,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <linux/cryptodev.h> +#include <linux/ioctl.h> #include <linux/mm.h> #include <linux/ncr.h> #include <linux/slab.h> #include <linux/highmem.h> #include <linux/random.h> -#include <asm/uaccess.h> -#include <asm/ioctl.h> +#include <linux/uaccess.h> #include <linux/scatterlist.h> #include "ncr-int.h" #include "cryptodev_int.h" diff --git a/crypto/userspace/ncr-key.c b/crypto/userspace/ncr-key.c index 31a88098ab3..82fa5113662 100644 --- a/crypto/userspace/ncr-key.c +++ b/crypto/userspace/ncr-key.c @@ -22,13 +22,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <linux/cryptodev.h> +#include <linux/ioctl.h> #include <linux/mm.h> #include <linux/ncr.h> #include <linux/slab.h> #include <linux/random.h> -#include <asm/uaccess.h> -#include <asm/ioctl.h> +#include <linux/uaccess.h> #include <linux/scatterlist.h> #include "ncr-int.h" diff --git a/crypto/userspace/ncr-pk.c b/crypto/userspace/ncr-pk.c index 36ea3983dad..4500495430a 100644 --- a/crypto/userspace/ncr-pk.c +++ b/crypto/userspace/ncr-pk.c @@ -22,13 +22,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <linux/cryptodev.h> +#include <linux/ioctl.h> #include <linux/mm.h> #include <linux/ncr.h> #include <linux/slab.h> #include <linux/random.h> -#include <asm/uaccess.h> -#include <asm/ioctl.h> +#include <linux/uaccess.h> #include <linux/scatterlist.h> #include "ncr-int.h" #include <tomcrypt.h> diff --git a/crypto/userspace/ncr-sessions.c b/crypto/userspace/ncr-sessions.c index 8052ba6123f..f3d3590359f 100644 --- a/crypto/userspace/ncr-sessions.c +++ b/crypto/userspace/ncr-sessions.c @@ -24,7 +24,7 @@ */ #include <linux/crypto.h> -#include <linux/cryptodev.h> +#include <linux/mutex.h> #include <linux/ncr.h> #include "ncr-int.h" #include <linux/mm_types.h> @@ -102,7 +102,7 @@ struct session_item_st* ncr_session_new(struct ncr_lists *lst) err(); goto err_sess; } - init_MUTEX(&sess->mem_mutex); + mutex_init(&sess->mem_mutex); atomic_set(&sess->refcnt, 2); /* One for lst->list, one for "sess" */ @@ -625,7 +625,7 @@ static int _ncr_session_update(struct ncr_lists* lists, struct ncr_session_op_st return -EINVAL; } - if (down_interruptible(&sess->mem_mutex)) { + if (mutex_lock_interruptible(&sess->mem_mutex)) { err(); _ncr_sessions_item_put(sess); return -ERESTARTSYS; @@ -706,7 +706,7 @@ fail: release_user_pages(sess->pages, sess->available_pages); sess->available_pages = 0; } - up(&sess->mem_mutex); + mutex_unlock(&sess->mem_mutex); _ncr_sessions_item_put(sess); return ret; @@ -752,7 +752,7 @@ static int _ncr_session_final(struct ncr_lists* lists, struct ncr_session_op_st* return ret; } - if (down_interruptible(&sess->mem_mutex)) { + if (mutex_lock_interruptible(&sess->mem_mutex)) { err(); _ncr_sessions_item_put(sess); return -ERESTARTSYS; @@ -879,7 +879,7 @@ fail: release_user_pages(sess->pages, sess->available_pages); sess->available_pages = 0; } - up(&sess->mem_mutex); + mutex_unlock(&sess->mem_mutex); cryptodev_hash_deinit(&sess->hash); if (sess->algorithm->is_symmetric) { diff --git a/crypto/userspace/ncr.c b/crypto/userspace/ncr.c index 61e8b1e853b..dad8adc4cc0 100644 --- a/crypto/userspace/ncr.c +++ b/crypto/userspace/ncr.c @@ -23,12 +23,11 @@ */ #include <linux/crypto.h> -#include <linux/cryptodev.h> +#include <linux/ioctl.h> #include <linux/mm.h> #include <linux/highmem.h> #include <linux/random.h> -#include <asm/uaccess.h> -#include <asm/ioctl.h> +#include <linux/uaccess.h> #include <linux/scatterlist.h> #include <linux/cred.h> #include <linux/capability.h> |