Unverified Commit 692b9167 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!694 [sync] PR-625: AMD: Fix build warning. 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/625 
 
This PR fixes below build warnings:
WARNING: modpost: EXPORT symbol "__SCT__perf_lopwr_cb" [vmlinux] version generation failed, symbol will not be versioned.
WARNING: modpost: EXPORT symbol "__SCT__perf_lopwr_cb" [vmlinux] version generation failed, symbol will not be versioned. 
 
Link:https://gitee.com/openeuler/kernel/pulls/694

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 1a82ccca f2968b34

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 −24
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 
#ifndef _ASM_X86_PERF_EVENT_H

#define _ASM_X86_PERF_EVENT_H



#ifndef __GENKSYMS__

#include <linux/static_call.h>

#endif



/*

 * Performance event hw details:
@@ -556,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>



/*