OSDN Git Service

s390: make setup_randomness work
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Sat, 4 Feb 2017 10:40:36 +0000 (11:40 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Mar 2017 01:57:12 +0000 (09:57 +0800)
commit296f7bd7f1dbd2379489ea779779ef437d9e6c6f
treeeddcb6f6203c7afe352a086c25ac5de331f28ecd
parent9cf431dbd8f78d4e78d4aa3ef4fb453cd71e2978
s390: make setup_randomness work

commit da8fd820f389a0e29080b14c61bf5cf1d8ef5ca1 upstream.

Commit bcfcbb6bae64 ("s390: add system information as device
randomness") intended to add some virtual machine specific information
to the randomness pool.

Unfortunately it uses the page allocator before it is ready to use. In
result the page allocator always returns NULL and the setup_randomness
function never adds anything to the randomness pool.

To fix this use memblock_alloc and memblock_free instead.

Fixes: bcfcbb6bae64 ("s390: add system information as device randomness")
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/s390/kernel/setup.c