diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2017-02-04 11:40:36 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-02-07 07:27:10 +0100 |
| commit | da8fd820f389a0e29080b14c61bf5cf1d8ef5ca1 (patch) | |
| tree | 8c2a7ef8db273862ce0b1f742f3f94f70f1c2150 /arch | |
| parent | f83435c42ee6e4233cc07130e2cf5022b95e1d32 (diff) | |
| download | linux-da8fd820f389a0e29080b14c61bf5cf1d8ef5ca1.tar.gz linux-da8fd820f389a0e29080b14c61bf5cf1d8ef5ca1.tar.bz2 linux-da8fd820f389a0e29080b14c61bf5cf1d8ef5ca1.zip | |
s390: make setup_randomness work
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 1a3388c32a83..aaef71ff7ab7 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -822,10 +822,10 @@ static void __init setup_randomness(void) { struct sysinfo_3_2_2 *vmms; - vmms = (struct sysinfo_3_2_2 *) alloc_page(GFP_KERNEL); - if (vmms && stsi(vmms, 3, 2, 2) == 0 && vmms->count) + vmms = (struct sysinfo_3_2_2 *) memblock_alloc(PAGE_SIZE, PAGE_SIZE); + if (stsi(vmms, 3, 2, 2) == 0 && vmms->count) add_device_randomness(&vmms, vmms->count); - free_page((unsigned long) vmms); + memblock_free((unsigned long) vmms, PAGE_SIZE); } /* |