diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-20 14:04:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-20 14:04:37 -0800 |
| commit | 292d38674301c6fbee3965e446bd1c8a6672a400 (patch) | |
| tree | 5444dc0f431d099cd3cf0e6f673663f17c8d55a5 /mm/shmem.c | |
| parent | 4abaa800fdc6303dc63d3f11080a31a6cf42f34d (diff) | |
| parent | 5773ebfee729acf93b330664eab4c8d77edc2193 (diff) | |
| download | linux-292d38674301c6fbee3965e446bd1c8a6672a400.tar.bz2 | |
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot updates from Ingo Molnar:
"Misc updates:
- fix e820 error handling
- convert page table setup code from assembly to C
- fix kexec environment bug
- ... plus small cleanups"
* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/kconfig: Remove misleading note regarding hibernation and KASLR
x86/boot: Fix KASLR and memmap= collision
x86/e820/32: Fix e820_search_gap() error handling on x86-32
x86/boot/32: Convert the 32-bit pgtable setup code from assembly to C
x86/e820: Make e820_search_gap() static and remove unused variables
Diffstat (limited to 'mm/shmem.c')
0 files changed, 0 insertions, 0 deletions