Commit 7c9e960c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'livepatching-for-5.19' of... 

Merge tag 'livepatching-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching

Pull livepatching cleanup from Petr Mladek:

 - Remove duplicated livepatch code [Christophe]

* tag 'livepatching-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
  livepatch: Remove klp_arch_set_pc() and asm/livepatch.h
parents 12831f64 5d7c8545

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -11434,8 +11434,6 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.g 
F:	Documentation/ABI/testing/sysfs-kernel-livepatch

F:	Documentation/livepatch/

F:	arch/powerpc/include/asm/livepatch.h

F:	arch/s390/include/asm/livepatch.h

F:	arch/x86/include/asm/livepatch.h

F:	include/linux/livepatch.h

F:	kernel/livepatch/

F:	kernel/module/livepatch.c

arch/powerpc/include/asm/livepatch.h

+1 −9
Original line number Diff line number Diff line
@@ -7,17 +7,9 @@ 
#ifndef _ASM_POWERPC_LIVEPATCH_H

#define _ASM_POWERPC_LIVEPATCH_H



#include <linux/module.h>

#include <linux/ftrace.h>

#include <linux/sched.h>

#include <linux/sched/task_stack.h>



#ifdef CONFIG_LIVEPATCH

static inline void klp_arch_set_pc(struct ftrace_regs *fregs, unsigned long ip)

{

	ftrace_instruction_pointer_set(fregs, ip);

}

#endif /* CONFIG_LIVEPATCH */



#ifdef CONFIG_LIVEPATCH_64

static inline void klp_init_thread_info(struct task_struct *p)

{

arch/powerpc/kernel/irq.c

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ 
#include <asm/machdep.h>

#include <asm/udbg.h>

#include <asm/smp.h>

#include <asm/livepatch.h>

#include <asm/hw_irq.h>

#include <asm/softirq_stack.h>

arch/powerpc/kernel/setup_64.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
#include <asm/udbg.h>

#include <asm/kexec.h>

#include <asm/code-patching.h>

#include <asm/livepatch.h>

#include <asm/ftrace.h>

#include <asm/opal.h>

#include <asm/cputhreads.h>

#include <asm/hw_irq.h>

arch/s390/include/asm/livepatch.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * livepatch.h - s390-specific Kernel Live Patching Core

 *

 *  Copyright (c) 2013-2015 SUSE

 *   Authors: Jiri Kosina

 *	      Vojtech Pavlik

 *	      Jiri Slaby

 */



#ifndef ASM_LIVEPATCH_H

#define ASM_LIVEPATCH_H



#include <linux/ftrace.h>

#include <asm/ptrace.h>



static inline void klp_arch_set_pc(struct ftrace_regs *fregs, unsigned long ip)

{

	ftrace_instruction_pointer_set(fregs, ip);

}



#endif