Return-Path: Received: from hrndva-omtalb.mail.rr.com (hrndva-omtalb.mail.rr.com [71.74.56.124]) by ozlabs.org (Postfix) with ESMTP id 73587DDE28 for ; Tue, 18 Nov 2008 06:11:46 +1100 (EST) Message-Id: <20081117191059.843727934@goodmis.org> References: <20081117190948.619751203@goodmis.org> Date: Mon, 17 Nov 2008 14:09:52 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Subject: [PATCH 4/4] ftrace,ppc: fix test of branch link Cc: Andrew Morton , Peter Zijlstra , Rusty Russell , Pekka Paalanen , David Miller , linuxppc-dev@ozlabs.org, Steven Rostedt , Paul Mundt , Paul Mackerras , Frederic Weisbecker , Ingo Molnar , Thomas Gleixner List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Impact: fix positive failure of branch link on PPC Paul Mackerras pointed out that the test to verify that the modify code is a banch link is incorrect. It was testing the wrong bits. This patch corrects the test. Reported-by: Paul Mackerras Signed-off-by: Steven Rostedt --- arch/powerpc/kernel/ftrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c index 81e338c..cc901b1 100644 --- a/arch/powerpc/kernel/ftrace.c +++ b/arch/powerpc/kernel/ftrace.c @@ -131,7 +131,7 @@ static int test_24bit_addr(unsigned long ip, unsigned long addr) static int is_bl_op(unsigned int op) { - return (op & 0xff000000) == 0x48000000; + return (op & 0xfc000003) == 0x48000001; } static int test_offset(unsigned long offset) -- 1.5.6.5 --