Skip to content

Commit d9905b2

Browse files
committed
asm-generic: introduce text-patching.h
jira LE-4694 Rebuild_History Non-Buildable kernel-6.12.0-55.43.1.el10_0 commit-author Mike Rapoport (Microsoft) <rppt@kernel.org> commit 0c3beac Several architectures support text patching, but they name the header files that declare patching functions differently. Make all such headers consistently named text-patching.h and add an empty header in asm-generic for architectures that do not support text patching. Link: https://lkml.kernel.org/r/20241023162711.2579610-4-rppt@kernel.org Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> # m68k Acked-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Luis Chamberlain <mcgrof@kernel.org> Tested-by: kdevops <kdevops@lists.linux.dev> Cc: Andreas Larsson <andreas@gaisler.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Ard Biesheuvel <ardb@kernel.org> Cc: Borislav Petkov (AMD) <bp@alien8.de> Cc: Brian Cain <bcain@quicinc.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Christophe Leroy <christophe.leroy@csgroup.eu> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Dinh Nguyen <dinguyen@kernel.org> Cc: Guo Ren <guoren@kernel.org> Cc: Helge Deller <deller@gmx.de> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Cc: Kent Overstreet <kent.overstreet@linux.dev> Cc: Liam R. Howlett <Liam.Howlett@Oracle.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Masami Hiramatsu (Google) <mhiramat@kernel.org> Cc: Matt Turner <mattst88@gmail.com> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Richard Weinberger <richard@nod.at> Cc: Russell King <linux@armlinux.org.uk> Cc: Song Liu <song@kernel.org> Cc: Stafford Horne <shorne@gmail.com> Cc: Steven Rostedt (Google) <rostedt@goodmis.org> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Uladzislau Rezki (Sony) <urezki@gmail.com> Cc: Vineet Gupta <vgupta@kernel.org> Cc: Will Deacon <will@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> (cherry picked from commit 0c3beac) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent f017899 commit d9905b2

File tree

92 files changed

+110
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+110
-70
lines changed

arch/alpha/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ generic-y += agp.h
55
generic-y += asm-offsets.h
66
generic-y += kvm_para.h
77
generic-y += mcs_spinlock.h
8+
generic-y += text-patching.h

arch/arc/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ generic-y += kvm_para.h
66
generic-y += mcs_spinlock.h
77
generic-y += parport.h
88
generic-y += user.h
9+
generic-y += text-patching.h
File renamed without changes.

arch/arm/kernel/ftrace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <asm/insn.h>
2424
#include <asm/set_memory.h>
2525
#include <asm/stacktrace.h>
26-
#include <asm/patch.h>
26+
#include <asm/text-patching.h>
2727

2828
/*
2929
* The compiler emitted profiling hook consists of

arch/arm/kernel/jump_label.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0
22
#include <linux/kernel.h>
33
#include <linux/jump_label.h>
4-
#include <asm/patch.h>
4+
#include <asm/text-patching.h>
55
#include <asm/insn.h>
66

77
static void __arch_jump_label_transform(struct jump_entry *entry,

arch/arm/kernel/kgdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/kgdb.h>
1616
#include <linux/uaccess.h>
1717

18-
#include <asm/patch.h>
18+
#include <asm/text-patching.h>
1919
#include <asm/traps.h>
2020

2121
struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] =

arch/arm/kernel/patch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <asm/fixmap.h>
1010
#include <asm/smp_plat.h>
1111
#include <asm/opcodes.h>
12-
#include <asm/patch.h>
12+
#include <asm/text-patching.h>
1313

1414
struct patch {
1515
void *addr;

arch/arm/probes/kprobes/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <asm/cacheflush.h>
2626
#include <linux/percpu.h>
2727
#include <linux/bug.h>
28-
#include <asm/patch.h>
28+
#include <asm/text-patching.h>
2929
#include <asm/sections.h>
3030

3131
#include "../decode-arm.h"

arch/arm/probes/kprobes/opt-arm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/* for arm_gen_branch */
1515
#include <asm/insn.h>
1616
/* for patch_text */
17-
#include <asm/patch.h>
17+
#include <asm/text-patching.h>
1818

1919
#include "core.h"
2020

File renamed without changes.

0 commit comments

Comments
 (0)