diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-11 19:53:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-11 19:53:42 +0100 |
| commit | b5dfcb09debc38582c3cb72a3c1a88b919b07f2d (patch) | |
| tree | e74d7000baeab5c3800701c275971dd925cbfa08 | |
| parent | e379ea82dd53a5cc8e3ac0b7899a8012006c712c (diff) | |
Revert "x86/UV: Add uvtrace support"
This reverts commit 8eba18428ac926f436064ac281e76d36d51bd631.
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: Ingo 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
| -rw-r--r-- | arch/x86/include/asm/uv/uv.h | 8 | ||||
| -rw-r--r-- | arch/x86/platform/uv/uv_nmi.c | 13 |
2 files changed, 1 insertions, 20 deletions
diff --git a/arch/x86/include/asm/uv/uv.h b/arch/x86/include/asm/uv/uv.h index 8b1283daa332..6b964a0b86d1 100644 --- a/arch/x86/include/asm/uv/uv.h +++ b/arch/x86/include/asm/uv/uv.h @@ -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, diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c index 9b8ac60ad8db..2e863ad4a772 100644 --- a/arch/x86/platform/uv/uv_nmi.c +++ b/arch/x86/platform/uv/uv_nmi.c @@ -1,5 +1,5 @@ /* - * 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); |