diff options
| author | Linus Torvalds | 2018-11-01 22:32:43 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2018-11-01 22:32:43 +0100 |
| commit | 90de1fb83e7c760aa403381f072486fc4e3e8b5f (patch) | |
| tree | c1af1fedd74b49aba1d4904befb7a5eab6859108 /arch/xtensa/mm | |
| parent | Merge tag 'stackleak-v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | xtensa: clean up xtensa-specific property sections (diff) | |
| download | kernel-qcow2-linux-90de1fb83e7c760aa403381f072486fc4e3e8b5f.tar.gz kernel-qcow2-linux-90de1fb83e7c760aa403381f072486fc4e3e8b5f.tar.xz kernel-qcow2-linux-90de1fb83e7c760aa403381f072486fc4e3e8b5f.zip | |
Merge tag 'xtensa-20181101' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa fixes and cleanups from Max Filippov:
- use ZONE_NORMAL instead of ZONE_DMA
- fix Image.elf build error caused by assignment of incorrect address
to the .note.Linux section
- clean up debug and property sections in the vmlinux.lds.S
* tag 'xtensa-20181101' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: clean up xtensa-specific property sections
xtensa: use DWARF_DEBUG in the vmlinux.lds.S
xtensa: add NOTES section to the linker script
xtensa: remove ZONE_DMA
Diffstat (limited to 'arch/xtensa/mm')
| -rw-r--r-- | arch/xtensa/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c index 9750a48f491b..30a48bba4a47 100644 --- a/arch/xtensa/mm/init.c +++ b/arch/xtensa/mm/init.c @@ -71,7 +71,7 @@ void __init zones_init(void) { /* All pages are DMA-able, so we put them all in the DMA zone. */ unsigned long zones_size[MAX_NR_ZONES] = { - [ZONE_DMA] = max_low_pfn - ARCH_PFN_OFFSET, + [ZONE_NORMAL] = max_low_pfn - ARCH_PFN_OFFSET, #ifdef CONFIG_HIGHMEM [ZONE_HIGHMEM] = max_pfn - max_low_pfn, #endif |