Commit 513f17f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sh-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux 

Pull sh updates from John Paul Adrian Glaubitz:
 "This is a bit larger than my previous one and mainly consists of
  clean-up work in the arch/sh directory by Geert Uytterhoeven and Randy
  Dunlap.

  Additionally, this fixes a bug in the Storage Queue code that was
  discovered while I was reviewing a patch to switch the code to the
  bitmap API by Christophe Jaillet.

  So this contains both a fix for the original bug in the Storage Queue
  code that can be backported later as well as the Christophe's patch to
  swich the code to the bitmap API.

  Summary:

   - Use generic GCC library routines

   - sq: Use the bitmap API when applicable

   - sq: Fix incorrect element size for allocating bitmap buffer

   - pci: Remove unused variable in SH-7786 PCI Express code

   - mcount.S: fix build error when PRINTK is not enabled

   - remove sh5/sh64 last fragments

   - math-emu: fix macro redefined warning

   - init: use OF_EARLY_FLATTREE for early init

   - nmi_debug: fix return value of __setup handler

   - SH2007: drop the bad URL info"

* tag 'sh-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
  sh: Replace <uapi/asm/types.h> by <asm-generic/int-ll64.h>
  sh: Use generic GCC library routines
  sh: sq: Use the bitmap API when applicable
  sh: sq: Fix incorrect element size for allocating bitmap buffer
  sh: pci: Remove unused variable in SH-7786 PCI Express code
  sh: mcount.S: fix build error when PRINTK is not enabled
  sh: remove sh5/sh64 last fragments
  sh: math-emu: fix macro redefined warning
  sh: init: use OF_EARLY_FLATTREE for early init
  sh: nmi_debug: fix return value of __setup handler
  sh: SH2007: drop the bad URL info
parents 35fab927 e5c23bec

Documentation/kbuild/kbuild.rst

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ directory name found in the arch/ directory. 
But some architectures such as x86 and sparc have aliases.



- x86: i386 for 32 bit, x86_64 for 64 bit

- sh: sh for 32 bit, sh64 for 64 bit

- sparc: sparc32 for 32 bit, sparc64 for 64 bit



CROSS_COMPILE

Documentation/scheduler/sched-arch.rst

+0 −2
Original line number Diff line number Diff line
@@ -70,7 +70,5 @@ Possible arch problems I found (and either tried to fix or didn't): 


ia64 - is safe_halt call racy vs interrupts? (does it sleep?) (See #4a)



sh64 - Is sleeping racy vs interrupts? (See #4a)



sparc - IRQs on at this point(?), change local_irq_save to _disable.

      - TODO: needs secondary CPUs to disable preempt (See #1)

Documentation/translations/zh_CN/scheduler/sched-arch.rst

+0 −2
Original line number Diff line number Diff line
@@ -70,7 +70,5 @@ arch/x86/kernel/process.c有轮询和睡眠空闲函数的例子。 


ia64 - safe_halt的调用与中断相比，是否很荒谬？ (它睡眠了吗) (参考 #4a)



sh64 - 睡眠与中断相比，是否很荒谬？ (参考 #4a)



sparc - 在这一点上，IRQ是开着的（？），把local_irq_save改为_disable。

      - 待办事项: 需要第二个CPU来禁用抢占 (参考 #1)

arch/sh/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ config SUPERH 
	select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST

	select GENERIC_IDLE_POLL_SETUP

	select GENERIC_IRQ_SHOW

	select GENERIC_LIB_ASHLDI3

	select GENERIC_LIB_ASHRDI3

	select GENERIC_LIB_LSHRDI3

	select GENERIC_PCI_IOMAP if PCI

	select GENERIC_SCHED_CLOCK

	select GENERIC_SMP_IDLE_THREAD

arch/sh/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ config SH_STANDARD_BIOS 


config STACK_DEBUG

	bool "Check for stack overflows"

	depends on DEBUG_KERNEL

	depends on DEBUG_KERNEL && PRINTK

	help

	  This option will cause messages to be printed if free stack space

	  drops below a certain limit. Saying Y here will add overhead to