Unverified Commit 0bf298ad authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Palmer Dabbelt
Browse files

riscv: entry: Remove extra level wrappers of trace_hardirqs_{on,off} 



Since riscv is converted to generic entry, there's no need for the
extra wrappers of trace_hardirqs_{on,off}.

Signed-off-by: default avatarJisheng Zhang <jszhang@kernel.org>
Reviewed-by: default avatarGuo Ren <guoren@kernel.org>
Reviewed-by: default avatarBjörn Töpel <bjorn@rivosinc.com>
Tested-by: default avatarGuo Ren <guoren@kernel.org>
Signed-off-by: default avatarGuo Ren <guoren@kernel.org>
Link: https://lore.kernel.org/r/20230222033021.983168-6-guoren@kernel.org


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent f0bddf50

arch/riscv/kernel/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ obj-$(CONFIG_CPU_PM) += suspend_entry.o suspend.o 
obj-$(CONFIG_FUNCTION_TRACER)	+= mcount.o ftrace.o

obj-$(CONFIG_DYNAMIC_FTRACE)	+= mcount-dyn.o



obj-$(CONFIG_TRACE_IRQFLAGS)	+= trace_irq.o



obj-$(CONFIG_PERF_EVENTS)	+= perf_callchain.o

obj-$(CONFIG_HAVE_PERF_REGS)	+= perf_regs.o

obj-$(CONFIG_RISCV_SBI)		+= sbi.o

arch/riscv/kernel/trace_irq.c

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

/*

 * Copyright (C) 2022 Changbin Du <changbin.du@gmail.com>

 */



#include <linux/irqflags.h>

#include <linux/kprobes.h>

#include "trace_irq.h"



/*

 * trace_hardirqs_on/off require the caller to setup frame pointer properly.

 * Otherwise, CALLER_ADDR1 might trigger an pagging exception in kernel.

 * Here we add one extra level so they can be safely called by low

 * level entry code which $fp is used for other purpose.

 */



void __trace_hardirqs_on(void)

{

	trace_hardirqs_on();

}

NOKPROBE_SYMBOL(__trace_hardirqs_on);



void __trace_hardirqs_off(void)

{

	trace_hardirqs_off();

}

NOKPROBE_SYMBOL(__trace_hardirqs_off);

arch/riscv/kernel/trace_irq.h

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

/*

 * Copyright (C) 2022 Changbin Du <changbin.du@gmail.com>

 */

#ifndef __TRACE_IRQ_H

#define __TRACE_IRQ_H



void __trace_hardirqs_on(void);

void __trace_hardirqs_off(void);



#endif /* __TRACE_IRQ_H */