Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c4d3bc9 authored by David Rientjes's avatar David Rientjes Committed by Linus Torvalds
Browse files

perf,x86: fix link failure for non-Intel configs 



Commit 1d9d8639 ("perf,x86: fix kernel crash with PEBS/BTS after
suspend/resume") introduces a link failure since
perf_restore_debug_store() is only defined for CONFIG_CPU_SUP_INTEL:

	arch/x86/power/built-in.o: In function `restore_processor_state':
	(.text+0x45c): undefined reference to `perf_restore_debug_store'

Fix it by defining the dummy function appropriately.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2a6e06b2

include/linux/perf_event.h

+5 −1
Original line number Diff line number Diff line
@@ -758,7 +758,6 @@ extern void perf_event_enable(struct perf_event *event); 
extern void perf_event_disable(struct perf_event *event);

extern int __perf_event_disable(void *info);

extern void perf_event_task_tick(void);

extern void perf_restore_debug_store(void);

#else

static inline void

perf_event_task_sched_in(struct task_struct *prev,
@@ -798,6 +797,11 @@ static inline void perf_event_enable(struct perf_event *event) { } 
static inline void perf_event_disable(struct perf_event *event)		{ }

static inline int __perf_event_disable(void *info)			{ return -1; }

static inline void perf_event_task_tick(void)				{ }

#endif



#if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_CPU_SUP_INTEL)

extern void perf_restore_debug_store(void);

#else

static inline void perf_restore_debug_store(void)			{ }

#endif