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

Commit b5dfcb09 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Revert "x86/UV: Add uvtrace support" 



This reverts commit 8eba1842.

uv_trace() is not used by anything, nor is uv_trace_nmi_func, nor
uv_trace_func.

That's not how we do instrumentation code in the kernel: we add
tracepoints, printk()s, etc. so that everyone not just those with
magic kernel modules can debug a system.

So remove this unused (and misguied) piece of code.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Mike Travis <travis@sgi.com>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Hedi Berriche <hedi@sgi.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Jason Wessel <jason.wessel@windriver.com>
Link: http://lkml.kernel.org/n/tip-tumfBffmr4jmnt8Gyxanoblg@git.kernel.org
parent e379ea82

arch/x86/include/asm/uv/uv.h

+0 −8
Original line number Diff line number Diff line
@@ -14,13 +14,6 @@ extern void uv_cpu_init(void); 
extern void uv_nmi_init(void);

extern void uv_register_nmi_notifier(void);

extern void uv_system_init(void);

extern void (*uv_trace_nmi_func)(unsigned int reason, struct pt_regs *regs);

extern void (*uv_trace_func)(const char *f, const int l, const char *fmt, ...);

#define uv_trace(fmt, ...)						\

do {									\

	if (unlikely(uv_trace_func))					\

		(uv_trace_func)(__func__, __LINE__, fmt, ##__VA_ARGS__);\

} while (0)

extern const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,

						 struct mm_struct *mm,

						 unsigned long start,
@@ -33,7 +26,6 @@ static inline enum uv_system_type get_uv_system_type(void) { return UV_NONE; } 
static inline int is_uv_system(void)	{ return 0; }

static inline void uv_cpu_init(void)	{ }

static inline void uv_system_init(void)	{ }

static inline void uv_trace(void *fmt, ...)	{ }

static inline void uv_register_nmi_notifier(void) { }

static inline const struct cpumask *

uv_flush_tlb_others(const struct cpumask *cpumask, struct mm_struct *mm,

arch/x86/platform/uv/uv_nmi.c

+1 −12
Original line number Diff line number Diff line 
/*

 * SGI NMI/TRACE support routines

 * SGI NMI support routines

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by
@@ -39,13 +39,6 @@ 
#include <asm/uv/uv_hub.h>

#include <asm/uv/uv_mmrs.h>



void (*uv_trace_func)(const char *f, const int l, const char *fmt, ...);

EXPORT_SYMBOL(uv_trace_func);



void (*uv_trace_nmi_func)(unsigned int reason, struct pt_regs *regs);

EXPORT_SYMBOL(uv_trace_nmi_func);





/*

 * UV handler for NMI

 *
@@ -599,10 +592,6 @@ int uv_handle_nmi(unsigned int reason, struct pt_regs *regs) 
		return NMI_DONE;

	}



	/* Call possible NMI trace function */

	if (unlikely(uv_trace_nmi_func))

		(uv_trace_nmi_func)(reason, regs);



	/* Indicate we are the first CPU into the NMI handler */

	master = (atomic_read(&uv_nmi_cpu) == cpu);