Commit 0075504d authored by Heiko Carstens's avatar Heiko Carstens Committed by Greg Kroah-Hartman

s390: make setup_randomness work

commit da8fd820 upstream.

Commit bcfcbb6b ("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: bcfcbb6b ("s390: add system information as device randomness")
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ca54585d
...@@ -820,10 +820,10 @@ static void __init setup_randomness(void) ...@@ -820,10 +820,10 @@ static void __init setup_randomness(void)
{ {
struct sysinfo_3_2_2 *vmms; struct sysinfo_3_2_2 *vmms;
vmms = (struct sysinfo_3_2_2 *) alloc_page(GFP_KERNEL); vmms = (struct sysinfo_3_2_2 *) memblock_alloc(PAGE_SIZE, PAGE_SIZE);
if (vmms && stsi(vmms, 3, 2, 2) == 0 && vmms->count) if (stsi(vmms, 3, 2, 2) == 0 && vmms->count)
add_device_randomness(&vmms, vmms->count); add_device_randomness(&vmms, vmms->count);
free_page((unsigned long) vmms); memblock_free((unsigned long) vmms, PAGE_SIZE);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment