Hi Linus,
please pull the following batch of updates for the Xtensa architecture.
There's a simple merge conflict in the
Documentation/features/debug/KASAN/arch-support.txt
The following changes since commit bebc6082da0a9f5d47a1ea2edc099bf671058bd4:
Linux 4.14 (2017-11-12 10:46:13 -0800)
are available in the git repository at:
git://github.com/jcmvbkbc/linux-xtensa.git tags/xtensa-20180129
for you to fetch changes up to ca47480921587ae30417dd234a9f79af188e3666:
xtensa: fix futex_atomic_cmpxchg_inatomic (2018-01-05 15:55:59 -0800)
----------------------------------------------------------------
Xtensa improvements for v4.16:
- add SSP support;
- add KASAN support;
- improvements to xtensa-specific assembly:
- use ENTRY and ENDPROC consistently;
- clean up and unify word alignment macros;
- clean up and unify fixup marking;
- use 'call' instead of 'callx' where possible;
- various cleanups:
- consiolidate kernel stack size related definitions;
- replace #ifdef'fed/commented out debug printk statements with pr_debug;
- use struct exc_table instead of flat array for exception handling data;
- build kernel with -mtext-section-literals; simplify xtensa linker script;
- fix futex_atomic_cmpxchg_inatomic.
----------------------------------------------------------------
Arnd Bergmann (1):
xtensa: shut up gcc-8 warnings
Max Filippov (20):
xtensa: add -mno-serialize-volatile to CFLAGS
xtensa: build kernel with text-section-literals
xtensa: use call instead of callx in assembly code
xtensa: clean up fixups in assembly code
xtensa: clean up word alignment macros in assembly code
xtensa: clean up functions in assembly code
xtensa: consolidate kernel stack size related definitions
xtensa: print hardware config ID on startup
xtensa: enable stack protector
xtensa: clean up custom-controlled debug output
xtensa: clean up exception handling structure
xtensa: implement early_trap_init
xtensa: extract init_kio
xtensa: don't clear swapper_pg_dir in paging_init
xtensa: move fixmap and kmap just above the KSEG
xtensa: add support for KASAN
xtensa: use __memset in __xtensa_clear_user
xtensa: use generic strncpy_from_user with KASAN
xtensa: print kernel sections info in mem_init
xtensa: fix futex_atomic_cmpxchg_inatomic
.../features/debug/KASAN/arch-support.txt | 2 +-
.../features/debug/stackprotector/arch-support.txt | 2 +-
Documentation/xtensa/mmu.txt | 78 ++++++------
arch/xtensa/Kconfig | 7 ++
arch/xtensa/Makefile | 7 +-
arch/xtensa/boot/boot-redboot/bootstrap.S | 1 +
arch/xtensa/boot/lib/Makefile | 6 +
arch/xtensa/include/asm/asmmacro.h | 40 ++++++
arch/xtensa/include/asm/current.h | 4 +-
arch/xtensa/include/asm/fixmap.h | 4 +-
arch/xtensa/include/asm/futex.h | 23 ++--
arch/xtensa/include/asm/highmem.h | 2 +-
arch/xtensa/include/asm/kasan.h | 37 ++++++
arch/xtensa/include/asm/kmem_layout.h | 7 ++
arch/xtensa/include/asm/linkage.h | 9 ++
arch/xtensa/include/asm/mmu_context.h | 1 +
arch/xtensa/include/asm/nommu_context.h | 4 +
arch/xtensa/include/asm/page.h | 2 -
arch/xtensa/include/asm/pgtable.h | 3 +-
arch/xtensa/include/asm/ptrace.h | 15 +--
arch/xtensa/include/asm/regs.h | 1 +
arch/xtensa/include/asm/stackprotector.h | 40 ++++++
arch/xtensa/include/asm/string.h | 23 +++-
arch/xtensa/include/asm/thread_info.h | 13 +-
arch/xtensa/include/asm/traps.h | 35 ++++++
arch/xtensa/include/asm/uaccess.h | 9 +-
arch/xtensa/kernel/Makefile | 3 -
arch/xtensa/kernel/align.S | 7 +-
arch/xtensa/kernel/asm-offsets.c | 16 +++
arch/xtensa/kernel/coprocessor.S | 3 +-
arch/xtensa/kernel/entry.S | 103 ++++++---------
arch/xtensa/kernel/head.S | 10 +-
arch/xtensa/kernel/module.c | 19 ++-
arch/xtensa/kernel/pci.c | 30 ++---
arch/xtensa/kernel/process.c | 6 +
arch/xtensa/kernel/setup.c | 49 +++++---
arch/xtensa/kernel/signal.c | 8 +-
arch/xtensa/kernel/traps.c | 64 +++++-----
arch/xtensa/kernel/vectors.S | 17 ++-
arch/xtensa/kernel/vmlinux.lds.S | 90 ++++----------
arch/xtensa/kernel/xtensa_ksyms.c | 5 +
arch/xtensa/lib/checksum.S | 74 +++++------
arch/xtensa/lib/memcopy.S | 81 +++++-------
arch/xtensa/lib/memset.S | 45 +++----
arch/xtensa/lib/pci-auto.c | 45 ++-----
arch/xtensa/lib/strncpy_user.S | 60 ++++-----
arch/xtensa/lib/strnlen_user.S | 28 ++---
arch/xtensa/lib/usercopy.S | 138 +++++++++------------
arch/xtensa/mm/Makefile | 5 +
arch/xtensa/mm/cache.c | 3 -
arch/xtensa/mm/fault.c | 22 ++--
arch/xtensa/mm/init.c | 36 ++++--
arch/xtensa/mm/kasan_init.c | 95 ++++++++++++++
arch/xtensa/mm/mmu.c | 31 ++---
arch/xtensa/mm/tlb.c | 6 +-
arch/xtensa/platforms/iss/console.c | 4 +-
arch/xtensa/platforms/iss/network.c | 14 +--
57 files changed, 829 insertions(+), 663 deletions(-)
create mode 100644 arch/xtensa/include/asm/kasan.h
create mode 100644 arch/xtensa/include/asm/linkage.h
create mode 100644 arch/xtensa/include/asm/stackprotector.h
create mode 100644 arch/xtensa/mm/kasan_init.c
--
Thanks.
-- Max