diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2017-03-15 02:09:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-15 02:09:48 +0000 |
| commit | 3d9e15ab2d4d2c7e9bcac8f2b6d6bbfac181f353 (patch) | |
| tree | b6b6a65b8de6bf407917e3d7ba0a5194dba2d63b | |
| parent | 83d128b227bbaea29771ce6864bcba7d5c6e4c09 (diff) | |
| parent | 296f7bd7f1dbd2379489ea779779ef437d9e6c6f (diff) | |
s390: make setup_randomness work
am: 296f7bd7f1
Change-Id: I47ce7a3407fd4716d30d8ab99aa2f6c252ed764f
| -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 1f581eb61bc2..1cf4aae76780 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -805,10 +805,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); } /* |