summaryrefslogtreecommitdiff
path: root/crypto/krng.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-10-17 09:32:49 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-17 09:32:49 -0300
commite648d1393463b72830a1c352143b31164ab1a696 (patch)
tree2da1f94be7c5b4f289f9fbda49d4c44f4dc85b03 /crypto/krng.c
parentfb6e03d937365cba54d5d8d923158562169ebfd1 (diff)
parentcacabe4c2b2a2f49562505b2a8e76ef6fe14e44b (diff)
downloadlinux-crypto-e648d1393463b72830a1c352143b31164ab1a696.tar.gz
linux-crypto-e648d1393463b72830a1c352143b31164ab1a696.zip
Merge tag 'v3.7-rc1' into staging/for_v3.8
Linux 3.7-rc1 * tag 'v3.7-rc1': (9579 commits) Linux 3.7-rc1 x86, boot: Explicitly include autoconf.h for hostprogs perf: Fix UAPI fallout ARM: config: make sure that platforms are ordered by option string ARM: config: sort select statements alphanumerically UAPI: (Scripted) Disintegrate include/linux/byteorder UAPI: (Scripted) Disintegrate include/linux UAPI: Unexport linux/blk_types.h UAPI: Unexport part of linux/ppp-comp.h perf: Handle new rbtree implementation procfs: don't need a PATH_MAX allocation to hold a string representation of an int vfs: embed struct filename inside of names_cache allocation if possible audit: make audit_inode take struct filename vfs: make path_openat take a struct filename pointer vfs: turn do_path_lookup into wrapper around struct filename variant audit: allow audit code to satisfy getname requests from its names_list vfs: define struct filename and have getname() return it btrfs: Fix compilation with user namespace support enabled userns: Fix posix_acl_file_xattr_userns gid conversion userns: Properly print bluetooth socket uids ...
Diffstat (limited to '')
-rw-r--r--crypto/krng.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/krng.c b/crypto/krng.c
index 4328bb34..a2d2b72f 100644
--- a/crypto/krng.c
+++ b/crypto/krng.c
@@ -35,7 +35,6 @@ static struct crypto_alg krng_alg = {
.cra_ctxsize = 0,
.cra_type = &crypto_rng_type,
.cra_module = THIS_MODULE,
- .cra_list = LIST_HEAD_INIT(krng_alg.cra_list),
.cra_u = {
.rng = {
.rng_make_random = krng_get_random,