Skip to contentSkip to conversation

printk-stop-including-cacheh-from-printkh.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message May 10, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: printk: stop including cache.h from printk.h
has been removed from the -mm tree. Its filename was
printk-stop-including-cacheh-from-printkh.patch

This patch was dropped because it was merged into mm-stable

------------------------------------------------------
From: Peter Collingbourne <[email protected]>
Subject: printk: stop including cache.h from printk.h

An inclusion of cache.h in printk.h was added in 2014 in commit c28aa1f0a847 ("printk/cache: mark printk_once test variable __read_mostly") in order to bring in the definition of __read_mostly. The usage of __read_mostly was later removed in commit 3ec25826ae33 ("printk:
Tie printk_once / printk_deferred_once into .data.once for reset") which made the inclusion of cache.h unnecessary, so remove it.

We have a small amount of code that depended on the inclusion of cache.h from printk.h; fix that code to include the appropriate header.

This fixes a circular inclusion on arm64 (linux/printk.h -> linux/cache.h -> asm/cache.h -> linux/kasan-enabled.h -> linux/static_key.h -> linux/jump_label.h -> linux/bug.h -> asm/bug.h -> linux/printk.h) that would otherwise be introduced by the next patch.

Build tested using {allyesconfig,defconfig} x {arm64,x86_64}.

Cc Alexander Potapenko <[email protected]>
Cc Andrey Konovalov <[email protected]>
Cc Andrey Ryabinin <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc David Rientjes <[email protected]>
Cc Dmitry Vyukov <[email protected]>
Cc Eric W. Biederman <[email protected]>
Cc Herbert Xu <[email protected]>
Cc Hyeonggon Yoo <[email protected]>
Cc Joonsoo Kim <[email protected]>
Cc Kees Cook <[email protected]>
Cc Pekka Enberg <[email protected]>
Cc Roman Gushchin <[email protected]>
Cc Vlastimil Babka <[email protected]>

---

 arch/arm64/include/asm/mte-kasan.h |    1 +
 arch/arm64/include/asm/percpu.h    |    1 +
 arch/csky/include/asm/processor.h  |    2 +-
 drivers/firmware/smccc/kvm_guest.c |    1 +
 include/linux/printk.h             |    1 -
 kernel/bpf/bpf_lru_list.h          |    1 +
 6 files changed, 5 insertions(+), 2 deletions(-)
arch/arm64/include/asm/mte-kasan.h renamed from arch/arm64/include/asm/mte-kasan.h~printk-stop-including-cacheh-from-printkh +1 -0
@@ -6,6 +6,7 @@
 #define __ASM_MTE_KASAN_H
 
 #include <asm/compiler.h>
+#include <asm/cputype.h>
 #include <asm/mte-def.h>
 
 #ifndef __ASSEMBLY__
arch/arm64/include/asm/percpu.h renamed from arch/arm64/include/asm/percpu.h~printk-stop-including-cacheh-from-printkh +1 -0
@@ -10,6 +10,7 @@
 #include <asm/alternative.h>
 #include <asm/cmpxchg.h>
 #include <asm/stack_pointer.h>
+#include <asm/sysreg.h>
 
 static inline void set_my_cpu_offset(unsigned long off)
 {
arch/csky/include/asm/processor.h renamed from arch/csky/include/asm/processor.h~printk-stop-including-cacheh-from-printkh +1 -1
@@ -4,9 +4,9 @@
 #define __ASM_CSKY_PROCESSOR_H
 
 #include <linux/bitops.h>
+#include <linux/cache.h>
 #include <asm/ptrace.h>
 #include <asm/current.h>
-#include <asm/cache.h>
 #include <abi/reg_ops.h>
 #include <abi/regdef.h>
 #include <abi/switch_context.h>
drivers/firmware/smccc/kvm_guest.c renamed from drivers/firmware/smccc/kvm_guest.c~printk-stop-including-cacheh-from-printkh +1 -0
@@ -4,6 +4,7 @@
 
 #include <linux/arm-smccc.h>
 #include <linux/bitmap.h>
+#include <linux/cache.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
include/linux/printk.h renamed from include/linux/printk.h~printk-stop-including-cacheh-from-printkh +0 -1
@@ -6,7 +6,6 @@
 #include <linux/init.h>
 #include <linux/kern_levels.h>
 #include <linux/linkage.h>
-#include <linux/cache.h>
 #include <linux/ratelimit_types.h>
 #include <linux/once_lite.h>
 
kernel/bpf/bpf_lru_list.h renamed from kernel/bpf/bpf_lru_list.h~printk-stop-including-cacheh-from-printkh +1 -0
@@ -4,6 +4,7 @@
 #ifndef __BPF_LRU_LIST_H_
 #define __BPF_LRU_LIST_H_
 
+#include <linux/cache.h>
 #include <linux/list.h>
 #include <linux/spinlock_types.h>
 

_

Patches currently in -mm which might be from [email protected] are