---

yaml
---
r: 198182
b: refs/heads/master
c: d28cff4
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a12c4632db1c0c548a7023e63869b27c7789a92
+refs/heads/master: d28cff4b615c2da274922311cef024d52c839870

trunk/arch/blackfin/include/asm/bfin-global.h

@@ -39,9 +39,15 @@ extern unsigned long sclk_to_usecs(unsigned long sclk);
 extern unsigned long usecs_to_sclk(unsigned long usecs);
 
 struct pt_regs;
+#if defined(CONFIG_DEBUG_VERBOSE)
 extern void dump_bfin_process(struct pt_regs *regs);
 extern void dump_bfin_mem(struct pt_regs *regs);
 extern void dump_bfin_trace_buffer(void);
+#else
+#define dump_bfin_process(regs)
+#define dump_bfin_mem(regs)
+#define dump_bfin_trace_buffer()
+#endif
 
 /* init functions only */
 extern int init_arch_irq(void);

trunk/arch/blackfin/include/asm/trace.h

@@ -23,8 +23,13 @@
 #ifndef __ASSEMBLY__
 extern unsigned long trace_buff_offset;
 extern unsigned long software_trace_buff[];
+#if defined(CONFIG_DEBUG_VERBOSE)
 extern void decode_address(char *buf, unsigned long address);
 extern bool get_instruction(unsigned short *val, unsigned short *address);
+#else
+#define decode_address(buf, address)
+#define get_instruction(val, address) 0
+#endif
 
 /* Trace Macros for C files */
 

trunk/arch/blackfin/kernel/Makefile

@@ -8,7 +8,7 @@ obj-y := \
 	entry.o process.o bfin_ksyms.o ptrace.o setup.o signal.o \
 	sys_bfin.o traps.o irqchip.o dma-mapping.o flat.o \
 	fixed_code.o reboot.o bfin_gpio.o bfin_dma_5xx.o \
-	trace.o exception.o dumpstack.o
+	exception.o dumpstack.o
 
 ifeq ($(CONFIG_GENERIC_CLOCKEVENTS),y)
     obj-y += time-ts.o
@@ -30,6 +30,7 @@ obj-$(CONFIG_NMI_WATCHDOG)           += nmi.o
 obj-$(CONFIG_EARLY_PRINTK)           += early_printk.o
 obj-$(CONFIG_EARLY_PRINTK)           += shadow_console.o
 obj-$(CONFIG_STACKTRACE)             += stacktrace.o
+obj-$(CONFIG_DEBUG_VERBOSE)          += trace.o
 
 # the kgdb test puts code into L2 and without linker
 # relaxation, we need to force long calls to/from it