From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754644AbYKQTMc (ORCPT ); Mon, 17 Nov 2008 14:12:32 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753997AbYKQTLr (ORCPT ); Mon, 17 Nov 2008 14:11:47 -0500 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:61420 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754153AbYKQTLq (ORCPT ); Mon, 17 Nov 2008 14:11:46 -0500 Message-Id: <20081117191059.843727934@goodmis.org> References: <20081117190948.619751203@goodmis.org> User-Agent: quilt/0.46-1 Date: Mon, 17 Nov 2008 14:09:52 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Thomas Gleixner , Peter Zijlstra , David Miller , Benjamin Herrenschmidt , Frederic Weisbecker , Pekka Paalanen , linuxppc-dev@ozlabs.org, Rusty Russell , Paul Mackerras , Paul Mundt , Steven Rostedt Subject: [PATCH 4/4] ftrace,ppc: fix test of branch link Content-Disposition: inline; filename=0004-ftrace-ppc-fix-test-of-branch-link.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --