Commit 600130a3 authored by Xie Haocheng's avatar Xie Haocheng
Browse files

kabi: Fix kabi breakage without build warning. 

amd inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6XNL2


CVE: NA

-------------------------------------------------
Error report detail:
*** ERROR - ABI BREAKAGE WAS DETECTED ***

The following symbols have been changed (this will cause an ABI breakage):
new kabi:
0x65d25289	__SCK__tp_func_xdp_exception	vmlinux	EXPORT_SYMBOL_GPL
0x5e9265ee	__tracepoint_xdp_exception	vmlinux	EXPORT_SYMBOL_GPL
old kabi:
0x5e0fbbff	__SCK__tp_func_xdp_exception	vmlinux	EXPORT_SYMBOL_GPL
0x017cc464	__tracepoint_xdp_exception	vmlinux	EXPORT_SYMBOL_GPL

Signed-off-by: default avatarXie Haocheng <haocheng.xie@amd.com>
parent fb465f68

arch/x86/events/amd/brs.c

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



#include "../perf_event.h"

#include <linux/static_call.h>



#define BRS_POISON	0xFFFFFFFFFFFFFFFEULL /* mark limit of valid entries */

arch/x86/events/amd/core.c

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

#include <asm/apic.h>

#include <asm/nmi.h>

#include <linux/static_call.h>



#include "../perf_event.h"

arch/x86/include/asm/perf_event.h

+0 −22
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#ifndef _ASM_X86_PERF_EVENT_H

#define _ASM_X86_PERF_EVENT_H



#include <linux/static_call.h>



/*

 * Performance event hw details:
@@ -554,27 +553,6 @@ static inline void intel_pt_handle_vmx(int on) 
#if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_CPU_SUP_AMD)

 extern void amd_pmu_enable_virt(void);

 extern void amd_pmu_disable_virt(void);



#if defined(CONFIG_PERF_EVENTS_AMD_BRS)



#define PERF_NEEDS_LOPWR_CB 1



/*

 * architectural low power callback impacts

 * drivers/acpi/processor_idle.c

 * drivers/acpi/acpi_pad.c

 */

extern void perf_amd_brs_lopwr_cb(bool lopwr_in);



DECLARE_STATIC_CALL(perf_lopwr_cb, perf_amd_brs_lopwr_cb);



static inline void perf_lopwr_cb(bool lopwr_in)

{

	static_call_mod(perf_lopwr_cb)(lopwr_in);

}



#endif /* PERF_NEEDS_LOPWR_CB */



#else

 static inline void amd_pmu_enable_virt(void) { }

 static inline void amd_pmu_disable_virt(void) { }

drivers/acpi/acpi_pad.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/slab.h>

#include <linux/acpi.h>

#include <linux/perf_event.h>

#include <linux/perf_event_lopwr.h>

#include <asm/mwait.h>

#include <xen/xen.h>

drivers/acpi/processor_idle.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/cpuidle.h>

#include <linux/cpu.h>

#include <linux/perf_event.h>

#include <linux/perf_event_lopwr.h>

#include <acpi/processor.h>



/*