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

diff --combined arch/xtensa/Kconfig
index 60c141af222bc5e05c426e6c0edf976e93c036d0,00b9a734048b04bd5676d7a90802a9a709ceca51..d29b7365da8d9facd71a887a071b34bbb68ec5fc
--- 1/arch/xtensa/Kconfig
--- 2/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -1,7 -1,4 +1,4 @@@
  # SPDX-License-Identifier: GPL-2.0
- config ZONE_DMA
-       def_bool y
- 
  config XTENSA
        def_bool y
        select ARCH_HAS_SG_CHAIN
@@@ -13,7 -10,7 +10,7 @@@
        select BUILDTIME_EXTABLE_SORT
        select CLONE_BACKWARDS
        select COMMON_CLK
 -      select DMA_NONCOHERENT_OPS
 +      select DMA_DIRECT_OPS
        select GENERIC_ATOMIC64
        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_SHOW
@@@ -28,11 -25,13 +25,11 @@@
        select HAVE_FUTEX_CMPXCHG if !MMU
        select HAVE_HW_BREAKPOINT if PERF_EVENTS
        select HAVE_IRQ_TIME_ACCOUNTING
 -      select HAVE_MEMBLOCK
        select HAVE_OPROFILE
        select HAVE_PERF_EVENTS
        select HAVE_STACKPROTECTOR
        select IRQ_DOMAIN
        select MODULES_USE_ELF_RELA
 -      select NO_BOOTMEM
        select PERF_USE_VMALLOC
        select VIRT_TO_BUS
        help

diff --combined arch/xtensa/kernel/vmlinux.lds.S
index b727b18a68acd9ff639d9da228fc70d94dc657ff,67a4f7f8a38d1e33cc25d6a26aa7a1852fd6793f..b80a430453b1cb7d76b8598db8eb0b06f039df8d
--- 1/arch/xtensa/kernel/vmlinux.lds.S
--- 2/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@@ -131,6 -131,7 +131,7 @@@ SECTION
    .fixup   : { *(.fixup) }
  
    EXCEPTION_TABLE(16)
+   NOTES
    /* Data section */
  
    _sdata = .;
@@@ -197,6 -198,7 +198,6 @@@
      INIT_SETUP(XCHAL_ICACHE_LINESIZE)
      INIT_CALLS
      CON_INITCALL
 -    SECURITY_INITCALL
      INIT_RAM_FS
    }
  
@@@ -296,38 -298,11 +297,11 @@@
  
    _end = .;
  
-   .xt.lit : { *(.xt.lit) }
-   .xt.prop : { *(.xt.prop) }
- 
-   .debug  0 :  { *(.debug) }
-   .line  0 :  { *(.line) }
-   .debug_srcinfo  0 :  { *(.debug_srcinfo) }
-   .debug_sfnames  0 :  { *(.debug_sfnames) }
-   .debug_aranges  0 :  { *(.debug_aranges) }
-   .debug_pubnames  0 :  { *(.debug_pubnames) }
-   .debug_info  0 :  { *(.debug_info) }
-   .debug_abbrev  0 :  { *(.debug_abbrev) }
-   .debug_line  0 :  { *(.debug_line) }
-   .debug_frame  0 :  { *(.debug_frame) }
-   .debug_str  0 :  { *(.debug_str) }
-   .debug_loc  0 :  { *(.debug_loc) }
-   .debug_macinfo  0 :  { *(.debug_macinfo) }
-   .debug_weaknames  0 :  { *(.debug_weaknames) }
-   .debug_funcnames  0 :  { *(.debug_funcnames) }
-   .debug_typenames  0 :  { *(.debug_typenames) }
-   .debug_varnames  0 :  { *(.debug_varnames) }
- 
-   .xt.insn 0 :
-   {
-     *(.xt.insn)
-     *(.gnu.linkonce.x*)
-   }
+   DWARF_DEBUG
  
-   .xt.lit 0 :
-   {
-     *(.xt.lit)
-     *(.gnu.linkonce.p*)
-   }
+   .xt.prop 0 : { KEEP(*(.xt.prop .xt.prop.* .gnu.linkonce.prop.*)) }
+   .xt.insn 0 : { KEEP(*(.xt.insn .xt.insn.* .gnu.linkonce.x*)) }
+   .xt.lit  0 : { KEEP(*(.xt.lit  .xt.lit.*  .gnu.linkonce.p*)) }
  
    /* Sections to be discarded */
    DISCARDS

diff --combined arch/xtensa/mm/init.c
index 9750a48f491b19c087b8b1013b4614eaf61e4cac,b385e6b73065f9db79d3c2a5ea68eb2189fff7df..30a48bba4a47372b81ce5f0e6e40aec8ca564dcd
--- 1/arch/xtensa/mm/init.c
--- 2/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@@ -18,7 -18,7 +18,7 @@@
  
  #include <linux/kernel.h>
  #include <linux/errno.h>
 -#include <linux/bootmem.h>
 +#include <linux/memblock.h>
  #include <linux/gfp.h>
  #include <linux/highmem.h>
  #include <linux/swap.h>
@@@ -71,7 -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
@@@ -152,7 -152,7 +152,7 @@@ void __init mem_init(void
        max_mapnr = max_pfn - ARCH_PFN_OFFSET;
        high_memory = (void *)__va(max_low_pfn << PAGE_SHIFT);
  
 -      free_all_bootmem();
 +      memblock_free_all();
  
        mem_init_print_info(NULL);
        pr_info("virtual kernel memory layout:\n"