tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull sh updates from John Paul Adrian Glaubitz:
"Fixes and improvements for sh:

- replace seq_printf() with the more efficient
seq_put_decimal_ull_width() to increase performance when stress
reading /proc/interrupts (David Wang)

- migrate sh to the generic rule for built-in DTB to help avoid race
conditions during parallel builds which can occur because Kbuild
decends into arch/*/boot/dts twice (Masahiro Yamada)

- replace select with imply in the board Kconfig for enabling
hardware with complex dependencies. This addresses warnings which
were reported by the kernel test robot (Geert Uytterhoeven)"

* tag 'sh-for-v6.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
sh: boards: Use imply to enable hardware with complex dependencies
sh: Migrate to the generic rule for built-in DTB
sh: irq: Use seq_put_decimal_ull_width() for decimal values

Linus Torvalds 5d82ca7b a86bf228

+11 -11
-1
arch/sh/Kbuild
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 2 obj-y += kernel/ mm/ boards/ 3 3 obj-$(CONFIG_SH_FPU_EMU) += math-emu/ 4 - obj-$(CONFIG_USE_BUILTIN_DTB) += boot/dts/ 5 4 6 5 obj-$(CONFIG_HD6446X_SERIES) += cchips/hd6446x/ 7 6
+4 -3
arch/sh/Kconfig
··· 648 648 649 649 menu "Boot options" 650 650 651 - config USE_BUILTIN_DTB 651 + config BUILTIN_DTB 652 652 bool "Use builtin DTB" 653 653 default n 654 654 depends on SH_DEVICE_TREE 655 + select GENERIC_BUILTIN_DTB 655 656 help 656 657 Link a device tree blob for particular hardware into the kernel, 657 658 suppressing use of the DTB pointer provided by the bootloader. ··· 660 659 not capable of providing a DTB to the kernel, or for experimental 661 660 hardware without stable device tree bindings. 662 661 663 - config BUILTIN_DTB_SOURCE 662 + config BUILTIN_DTB_NAME 664 663 string "Source file for builtin DTB" 665 664 default "" 666 - depends on USE_BUILTIN_DTB 665 + depends on BUILTIN_DTB 667 666 help 668 667 Base name (without suffix, relative to arch/sh/boot/dts) for the 669 668 a DTS file that will be used to produce the DTB linked into the
+2 -2
arch/sh/boards/Kconfig
··· 80 80 select SOLUTION_ENGINE 81 81 depends on CPU_SUBTYPE_SH7724 82 82 select GPIOLIB 83 - select SND_SOC_AK4642 if SND_SIMPLE_CARD 84 83 select REGULATOR_FIXED_VOLTAGE if REGULATOR 84 + imply SND_SOC_AK4642 if SND_SIMPLE_CARD 85 85 help 86 86 Select 7724 SolutionEngine if configuring for a Hitachi SH7724 87 87 evaluation board. ··· 259 259 bool "EcoVec" 260 260 depends on CPU_SUBTYPE_SH7724 261 261 select GPIOLIB 262 - select SND_SOC_DA7210 if SND_SIMPLE_CARD 263 262 select REGULATOR_FIXED_VOLTAGE if REGULATOR 263 + imply SND_SOC_DA7210 if SND_SIMPLE_CARD 264 264 help 265 265 Renesas "R0P7724LC0011/21RL (EcoVec)" support. 266 266
+1 -1
arch/sh/boot/dts/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - obj-$(CONFIG_USE_BUILTIN_DTB) += $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_SOURCE)) 2 + obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_NAME))
+2 -2
arch/sh/kernel/irq.c
··· 43 43 { 44 44 int j; 45 45 46 - seq_printf(p, "%*s: ", prec, "NMI"); 46 + seq_printf(p, "%*s:", prec, "NMI"); 47 47 for_each_online_cpu(j) 48 - seq_printf(p, "%10u ", per_cpu(irq_stat.__nmi_count, j)); 48 + seq_put_decimal_ull_width(p, " ", per_cpu(irq_stat.__nmi_count, j), 10); 49 49 seq_printf(p, " Non-maskable interrupts\n"); 50 50 51 51 seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
+2 -2
arch/sh/kernel/setup.c
··· 249 249 /* Avoid calling an __init function on secondary cpus. */ 250 250 if (done) return; 251 251 252 - #ifdef CONFIG_USE_BUILTIN_DTB 252 + #ifdef CONFIG_BUILTIN_DTB 253 253 dt_virt = __dtb_start; 254 254 #else 255 255 dt_virt = phys_to_virt(dt_phys); ··· 323 323 sh_early_platform_driver_probe("earlyprintk", 1, 1); 324 324 325 325 #ifdef CONFIG_OF_EARLY_FLATTREE 326 - #ifdef CONFIG_USE_BUILTIN_DTB 326 + #ifdef CONFIG_BUILTIN_DTB 327 327 unflatten_and_copy_device_tree(); 328 328 #else 329 329 unflatten_device_tree();