diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-28 09:58:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-28 09:58:46 -0700 |
| commit | 14bc84ce0b41787acc08aefabe718479c5dde60e (patch) | |
| tree | 865d39bf0c4682e11c9c7bef0712872b2a5eca55 /kernel | |
| parent | 2decb2682f80759f631c8332f9a2a34a02150a03 (diff) | |
| parent | 57127645d79d2e83e801f141f7d03f64accf28aa (diff) | |
| download | op-kernel-dev-14bc84ce0b41787acc08aefabe718479c5dde60e.zip op-kernel-dev-14bc84ce0b41787acc08aefabe718479c5dde60e.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Martin Schwidefsky:
"One additional new feature for 4.1, a new PRNG based on SHA-512 for
the zcrypt driver.
Two memory management related changes, the page table reallocation for
KVM is removed, and with file ptes gone the encoding of page table
entries is improved.
And three bug fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/zcrypt: Introduce new SHA-512 based Pseudo Random Generator.
s390/mm: change swap pte encoding and pgtable cleanup
s390/mm: correct transfer of dirty & young bits in __pmd_to_pte
s390/bpf: add dependency to z196 features
s390/3215: free memory in error path
s390/kvm: remove delayed reallocation of page tables for KVM
kexec: allocate the kexec control page with KEXEC_CONTROL_MEMORY_GFP
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kexec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index 38c25b1..7a36fdc 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -707,7 +707,7 @@ static struct page *kimage_alloc_normal_control_pages(struct kimage *image, do { unsigned long pfn, epfn, addr, eaddr; - pages = kimage_alloc_pages(GFP_KERNEL, order); + pages = kimage_alloc_pages(KEXEC_CONTROL_MEMORY_GFP, order); if (!pages) break; pfn = page_to_pfn(pages); |
