diff options
| -rw-r--r-- | cryptodev_cipher.c | 4 | ||||
| -rw-r--r-- | cryptodev_main.c | 6 | ||||
| -rw-r--r-- | ncr-dh.c | 4 | ||||
| -rw-r--r-- | ncr-int.h | 2 | ||||
| -rw-r--r-- | ncr-key-storage.c | 4 | ||||
| -rw-r--r-- | ncr-key-wrap.c | 4 | ||||
| -rw-r--r-- | ncr-key.c | 4 | ||||
| -rw-r--r-- | ncr-pk.c | 4 | ||||
| -rw-r--r-- | ncr-sessions.c | 11 | ||||
| -rw-r--r-- | ncr.c | 4 |
10 files changed, 24 insertions, 23 deletions
diff --git a/cryptodev_cipher.c b/cryptodev_cipher.c index 01dc29d..8322027 100644 --- a/cryptodev_cipher.c +++ b/cryptodev_cipher.c @@ -25,10 +25,10 @@ #include <linux/crypto.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.h" diff --git a/cryptodev_main.c b/cryptodev_main.c index 3223acd..a056b44 100644 --- a/cryptodev_main.c +++ b/cryptodev_main.c @@ -34,12 +34,12 @@ #include <linux/crypto.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 <linux/uaccess.h> #include "cryptodev.h" -#include <asm/uaccess.h> -#include <asm/ioctl.h> #include <linux/scatterlist.h> #include "cryptodev_int.h" #include "ncr-int.h" @@ -951,7 +951,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, @@ -22,12 +22,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <linux/ioctl.h> #include <linux/mm.h> #include <linux/slab.h> #include <linux/random.h> +#include <linux/uaccess.h> #include "cryptodev.h" -#include <asm/uaccess.h> -#include <asm/ioctl.h> #include <linux/scatterlist.h> #include <ncr.h> #include <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/ncr-key-storage.c b/ncr-key-storage.c index 41e52b7..fc6948f 100644 --- a/ncr-key-storage.c +++ b/ncr-key-storage.c @@ -22,11 +22,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <linux/ioctl.h> #include <linux/mm.h> #include <linux/slab.h> +#include <linux/uaccess.h> #include "cryptodev.h" -#include <asm/uaccess.h> -#include <asm/ioctl.h> #include <linux/scatterlist.h> #include "ncr.h" #include "ncr-int.h" diff --git a/ncr-key-wrap.c b/ncr-key-wrap.c index d5d3df0..0c56def 100644 --- a/ncr-key-wrap.c +++ b/ncr-key-wrap.c @@ -22,13 +22,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <linux/ioctl.h> #include <linux/mm.h> #include <linux/slab.h> #include <linux/highmem.h> #include <linux/random.h> +#include <linux/uaccess.h> #include "cryptodev.h" -#include <asm/uaccess.h> -#include <asm/ioctl.h> #include <linux/scatterlist.h> #include "ncr.h" #include "ncr-int.h" @@ -22,12 +22,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <linux/ioctl.h> #include <linux/mm.h> #include <linux/slab.h> #include <linux/random.h> +#include <linux/uaccess.h> #include "cryptodev.h" -#include <asm/uaccess.h> -#include <asm/ioctl.h> #include <linux/scatterlist.h> #include "ncr.h" #include "ncr-int.h" @@ -22,12 +22,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <linux/ioctl.h> #include <linux/mm.h> #include <linux/slab.h> #include <linux/random.h> +#include <linux/uaccess.h> #include "cryptodev.h" -#include <asm/uaccess.h> -#include <asm/ioctl.h> #include <linux/scatterlist.h> #include "ncr.h" #include "ncr-int.h" diff --git a/ncr-sessions.c b/ncr-sessions.c index 3109292..2916729 100644 --- a/ncr-sessions.c +++ b/ncr-sessions.c @@ -24,6 +24,7 @@ */ #include <linux/crypto.h> +#include <linux/mutex.h> #include "cryptodev.h" #include "ncr.h" #include "ncr-int.h" @@ -102,7 +103,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 +626,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 +707,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 +753,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 +880,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) { @@ -23,12 +23,12 @@ */ #include <linux/crypto.h> +#include <linux/ioctl.h> #include <linux/mm.h> #include <linux/highmem.h> #include <linux/random.h> +#include <linux/uaccess.h> #include "cryptodev.h" -#include <asm/uaccess.h> -#include <asm/ioctl.h> #include <linux/scatterlist.h> #include <linux/cred.h> #include <linux/capability.h> |