From: Linus Torvalds Date: Sun, 21 Feb 2021 21:18:26 +0000 (-0800) Subject: Merge tag 'mips_5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux X-Git-Tag: v5.15~1744 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2671fe5e1d48fe2c14a46bdf8fd9d7b24f88c1e2;p=mirror_ubuntu-kernels.git Merge tag 'mips_5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux Pull MIPS updates from Thomas Bogendoerfer: - added support for Nintendo N64 - added support for Realtek RTL83XX SoCs - kaslr support for Loongson64 - first steps to get rid of set_fs() - DMA runtime coherent/non-coherent selection cleanup - cleanups and fixes * tag 'mips_5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (98 commits) Revert "MIPS: Add basic support for ptrace single step" vmlinux.lds.h: catch more UBSAN symbols into .data MIPS: kernel: Drop kgdb_call_nmi_hook MAINTAINERS: Add git tree for KVM/mips MIPS: Use common way to parse elfcorehdr MIPS: Simplify EVA cache handling Revert "MIPS: kernel: {ftrace,kgdb}: Set correct address limit for cache flushes" MIPS: remove CONFIG_DMA_PERDEV_COHERENT MIPS: remove CONFIG_DMA_MAYBE_COHERENT driver core: lift dma_default_coherent into common code MIPS: refactor the runtime coherent vs noncoherent DMA indicators MIPS/alchemy: factor out the DMA coherent setup MIPS/malta: simplify plat_setup_iocoherency MIPS: Add basic support for ptrace single step MAINTAINERS: replace non-matching patterns for loongson{2,3} MIPS: Make check condition for SDBBP consistent with EJTAG spec mips: Replace lkml.org links with lore Revert "MIPS: microMIPS: Fix the judgment of mm_jr16_op and mm_jalr_op" MIPS: crash_dump.c: Simplify copy_oldmem_page() Revert "mips: Manually call fdt_init_reserved_mem() method" ... --- 2671fe5e1d48fe2c14a46bdf8fd9d7b24f88c1e2 diff --cc .mailmap index 7fdf87b24fe8,d942f9493a47..ade90fc9140a --- a/.mailmap +++ b/.mailmap @@@ -202,8 -200,7 +202,9 @@@ Li Yang Lukasz Luba Maciej W. Rozycki + Maciej W. Rozycki +Manivannan Sadhasivam +Manivannan Sadhasivam Marcin Nowakowski Marc Zyngier Mark Brown diff --cc arch/mips/Kconfig index 465bc5425d4c,47715cbaf810..d89efba3d8a4 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@@ -74,7 -75,10 +75,9 @@@ config MIP select HAVE_LD_DEAD_CODE_DATA_ELIMINATION select HAVE_MOD_ARCH_SPECIFIC select HAVE_NMI - select HAVE_OPROFILE select HAVE_PERF_EVENTS + select HAVE_PERF_REGS + select HAVE_PERF_USER_STACK_DUMP select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RSEQ select HAVE_SPARSE_SYSCALL_NR diff --cc arch/mips/include/asm/Kbuild index 95b4fa7bd0d1,9040ff0b3a14..8f6fe69674b7 --- a/arch/mips/include/asm/Kbuild +++ b/arch/mips/include/asm/Kbuild @@@ -4,8 -4,13 +4,12 @@@ generated-y += syscall_table_32_o32. generated-y += syscall_table_64_n32.h generated-y += syscall_table_64_n64.h generated-y += syscall_table_64_o32.h + generated-y += unistd_nr_n32.h + generated-y += unistd_nr_n64.h + generated-y += unistd_nr_o32.h + generic-y += export.h generic-y += kvm_para.h -generic-y += local64.h generic-y += mcs_spinlock.h generic-y += parport.h generic-y += qrwlock.h