From: Mike Frysinger <vapier.adi@gmail.com>
Date: Tue, 18 Nov 2008 09:48:22 +0000 (+0800)
Subject: Blackfin arch: do not define decode_instruction if hwtrace is turned off
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=36f649a55aa3ad1e2196403ba95a652f9900bc50;p=deliverable%2Flinux.git

Blackfin arch: do not define decode_instruction if hwtrace is turned off

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
---

diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index af7cc43630de..950cc822fb75 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -649,13 +649,13 @@ static bool get_instruction(unsigned short *val, unsigned short *address)
 	return false;
 }
 
-/* 
+/*
  * decode the instruction if we are printing out the trace, as it
  * makes things easier to follow, without running it through objdump
  * These are the normal instructions which cause change of flow, which
  * would be at the source of the trace buffer
  */
-#ifdef CONFIG_DEBUG_VERBOSE
+#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_BFIN_HWTRACE_ON)
 static void decode_instruction(unsigned short *address)
 {
 	unsigned short opcode;