Merge branch 'next/nommu' into for-next

Conflicts: arch/riscv/boot/Makefile arch/riscv/include/asm/sbi.h
2026-10-14 05:55:17 +00:00 · 2019-11-22 18:59:09 -08:00 · 2019-11-22 18:59:09 -08:00 · 5ba9aa56e6
commit 5ba9aa56e6
parent 4a979862dd 405fe7aa0d
54 changed files with 947 additions and 375 deletions
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
--- a/arch/riscv/boot/Makefile
+++ b/arch/riscv/boot/Makefile
--- a/arch/riscv/boot/loader.S
+++ b/arch/riscv/boot/loader.S
--- a/arch/riscv/boot/loader.lds.S
+++ b/arch/riscv/boot/loader.lds.S
--- a/arch/riscv/configs/nommu_virt_defconfig
+++ b/arch/riscv/configs/nommu_virt_defconfig
--- a/arch/riscv/include/asm/cache.h
+++ b/arch/riscv/include/asm/cache.h
--- a/arch/riscv/include/asm/clint.h
+++ b/arch/riscv/include/asm/clint.h
--- a/arch/riscv/include/asm/csr.h
+++ b/arch/riscv/include/asm/csr.h
--- a/arch/riscv/include/asm/elf.h
+++ b/arch/riscv/include/asm/elf.h
--- a/arch/riscv/include/asm/fixmap.h
+++ b/arch/riscv/include/asm/fixmap.h
--- a/arch/riscv/include/asm/futex.h
+++ b/arch/riscv/include/asm/futex.h
--- a/arch/riscv/include/asm/io.h
+++ b/arch/riscv/include/asm/io.h
--- a/arch/riscv/include/asm/irqflags.h
+++ b/arch/riscv/include/asm/irqflags.h
--- a/arch/riscv/include/asm/mmio.h
+++ b/arch/riscv/include/asm/mmio.h
--- a/arch/riscv/include/asm/mmu.h
+++ b/arch/riscv/include/asm/mmu.h
--- a/arch/riscv/include/asm/page.h
+++ b/arch/riscv/include/asm/page.h
--- a/arch/riscv/include/asm/pgalloc.h
+++ b/arch/riscv/include/asm/pgalloc.h
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
--- a/arch/riscv/include/asm/processor.h
+++ b/arch/riscv/include/asm/processor.h
--- a/arch/riscv/include/asm/ptrace.h
+++ b/arch/riscv/include/asm/ptrace.h
--- a/arch/riscv/include/asm/sbi.h
+++ b/arch/riscv/include/asm/sbi.h
--- a/arch/riscv/include/asm/switch_to.h
+++ b/arch/riscv/include/asm/switch_to.h
--- a/arch/riscv/include/asm/timex.h
+++ b/arch/riscv/include/asm/timex.h
--- a/arch/riscv/include/asm/tlbflush.h
+++ b/arch/riscv/include/asm/tlbflush.h
--- a/arch/riscv/include/asm/uaccess.h
+++ b/arch/riscv/include/asm/uaccess.h
--- a/arch/riscv/kernel/Makefile
+++ b/arch/riscv/kernel/Makefile
--- a/arch/riscv/kernel/asm-offsets.c
+++ b/arch/riscv/kernel/asm-offsets.c
--- a/arch/riscv/kernel/clint.c
+++ b/arch/riscv/kernel/clint.c
--- a/arch/riscv/kernel/entry.S
+++ b/arch/riscv/kernel/entry.S
--- a/arch/riscv/kernel/fpu.S
+++ b/arch/riscv/kernel/fpu.S
--- a/arch/riscv/kernel/head.S
+++ b/arch/riscv/kernel/head.S
--- a/arch/riscv/kernel/irq.c
+++ b/arch/riscv/kernel/irq.c
--- a/arch/riscv/kernel/perf_callchain.c
+++ b/arch/riscv/kernel/perf_callchain.c
--- a/arch/riscv/kernel/process.c
+++ b/arch/riscv/kernel/process.c
--- a/arch/riscv/kernel/reset.c
+++ b/arch/riscv/kernel/reset.c
--- a/arch/riscv/kernel/sbi.c
+++ b/arch/riscv/kernel/sbi.c
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
--- a/arch/riscv/kernel/signal.c
+++ b/arch/riscv/kernel/signal.c
--- a/arch/riscv/kernel/smp.c
+++ b/arch/riscv/kernel/smp.c
--- a/arch/riscv/kernel/smpboot.c
+++ b/arch/riscv/kernel/smpboot.c
--- a/arch/riscv/kernel/traps.c
+++ b/arch/riscv/kernel/traps.c
--- a/arch/riscv/lib/Makefile
+++ b/arch/riscv/lib/Makefile
--- a/arch/riscv/lib/uaccess.S
+++ b/arch/riscv/lib/uaccess.S
--- a/arch/riscv/mm/Makefile
+++ b/arch/riscv/mm/Makefile
--- a/arch/riscv/mm/cacheflush.c
+++ b/arch/riscv/mm/cacheflush.c
--- a/arch/riscv/mm/context.c
+++ b/arch/riscv/mm/context.c
--- a/arch/riscv/mm/extable.c
+++ b/arch/riscv/mm/extable.c
--- a/arch/riscv/mm/fault.c
+++ b/arch/riscv/mm/fault.c
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
--- a/drivers/clocksource/timer-riscv.c
+++ b/drivers/clocksource/timer-riscv.c
--- a/drivers/irqchip/irq-sifive-plic.c
+++ b/drivers/irqchip/irq-sifive-plic.c
--- a/drivers/tty/hvc/Kconfig
+++ b/drivers/tty/hvc/Kconfig
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig