Merge tag 'xtensa-20181115' of git://github.com/jcmvbkbc/linux-xtensa

Pull Xtensa fixes from Max Filippov:

 - fix stack alignment for bFLT binaries.

 - fix physical-to-virtual address translation for boot parameters in
   MMUv3 256+256 and 512+512 virtual memory layouts.

* tag 'xtensa-20181115' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: fix boot parameters address translation
  xtensa: make sure bFLT stack is 16 byte aligned

diff --combined arch/xtensa/include/asm/processor.h
index be9bfd9aa865beb554b2b6e7ce92010cf276b927,677bc76c1d7078e0ed78c84f1e5eac14363bd7e9..34a23016dd1442f5c95d445f13276d97c772072d
--- 1/arch/xtensa/include/asm/processor.h
--- 2/arch/xtensa/include/asm/processor.h
+++ b/arch/xtensa/include/asm/processor.h
@@@ -23,7 -23,11 +23,11 @@@
  # error Linux requires the Xtensa Windowed Registers Option.
  #endif
  
- #define ARCH_SLAB_MINALIGN    XCHAL_DATA_WIDTH
+ /* Xtensa ABI requires stack alignment to be at least 16 */
+ 
+ #define STACK_ALIGN (XCHAL_DATA_WIDTH > 16 ? XCHAL_DATA_WIDTH : 16)
+ 
+ #define ARCH_SLAB_MINALIGN STACK_ALIGN
  
  /*
   * User space process size: 1 GB.
@@@ -152,6 -156,14 +156,6 @@@ struct thread_struct 
        int align[0] __attribute__ ((aligned(16)));
  };
  
 -
 -/*
 - * Default implementation of macro that returns current
 - * instruction pointer ("program counter").
 - */
 -#define current_text_addr()  ({ __label__ _l; _l: &&_l;})
 -
 -
  /* This decides where the kernel will search for a free chunk of vm
   * space during mmap's.
   */