Commit 24318ae8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sh-for-5.16' of git://git.libc.org/linux-sh 

Pull arch/sh updates from Rich Felker.

* tag 'sh-for-5.16' of git://git.libc.org/linux-sh:
  sh: pgtable-3level: Fix cast to pointer from integer of different size
  sh: fix READ/WRITE redefinition warnings
  sh: define __BIG_ENDIAN for math-emu
  sh: math-emu: drop unused functions
  sh: fix kconfig unmet dependency warning for FRAME_POINTER
  sh: Cleanup about SPARSE_IRQ
  sh: kdump: add some attribute to function
  maple: fix wrong return value of maple_bus_init().
  sh: boot: avoid unneeded rebuilds under arch/sh/boot/compressed/
  sh: boot: add intermediate vmlinux.bin* to targets instead of extra-y
  sh: boards: Fix the cacography in irq.c
  sh: check return code of request_irq
  sh: fix trivial misannotations
parents 6ea45c57 8518e694

arch/sh/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ config SUPERH 
	select HAVE_STACKPROTECTOR

	select HAVE_SYSCALL_TRACEPOINTS

	select IRQ_FORCED_THREADING

	select MAY_HAVE_SPARSE_IRQ

	select MODULES_USE_ELF_RELA

	select NEED_SG_DMA_LENGTH

	select NO_DMA if !MMU && !DMA_COHERENT

arch/sh/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ config DUMP_CODE 


config DWARF_UNWINDER

	bool "Enable the DWARF unwinder for stacktraces"

	depends on DEBUG_KERNEL

	select FRAME_POINTER

	default n

	help

arch/sh/boards/mach-landisk/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ enum { 
	PCI_INTD, /* PCI int D */

	ATA,	  /* ATA */

	FATA,	  /* CF */

	POWER,	  /* Power swtich */

	BUTTON,	  /* Button swtich */

	POWER,	  /* Power switch */

	BUTTON,	  /* Button switch */

};



/* Vectors for LANDISK */

arch/sh/boot/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ suffix-$(CONFIG_KERNEL_XZ) := xz 
suffix-$(CONFIG_KERNEL_LZO)	:= lzo



targets := zImage vmlinux.srec romImage uImage uImage.srec uImage.gz \

	   uImage.bz2 uImage.lzma uImage.xz uImage.lzo uImage.bin

extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \

	   uImage.bz2 uImage.lzma uImage.xz uImage.lzo uImage.bin \

	   vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \

	   vmlinux.bin.xz vmlinux.bin.lzo

subdir- := compressed romimage

arch/sh/boot/compressed/.gitignore

+0 −5
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

ashiftrt.S

ashldi3.c

ashlsi3.S

ashrsi3.S

lshrsi3.S

vmlinux.bin.*