From patchwork Tue Feb 14 05:59:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 727705 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vMsGq3cF7z9s65 for ; Tue, 14 Feb 2017 17:00:51 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="l+Xq7lJd"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3vMsGq2NcdzDqHR for ; Tue, 14 Feb 2017 17:00:51 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="l+Xq7lJd"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3vMsFK5VM3zDq8M for ; Tue, 14 Feb 2017 16:59:33 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="l+Xq7lJd"; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3vMsFK3Tn1z9s65; Tue, 14 Feb 2017 16:59:33 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1487051973; bh=nyx1Dp4Rk+bez+JIud+sibqWUrsci93Y8mnA8eEK6lo=; h=Date:From:To:Cc:Subject:From; b=l+Xq7lJdTwAIALDlH+gJpnkeTNGo1Y82S9O55qcA6oc2BprqLbJldp/uOSPVSbXfi ddhVX8CM8us59bbtGOuk+PmUWNLtUJfKHnxIHIrkTjMrWK7jWW4/nu7ZXoDzErk0vK 82J4cHyUn3ST7V7qAR8tKHg7zCa3em0wSUW3j8Z8= Date: Tue, 14 Feb 2017 16:59:33 +1100 From: Stephen Rothwell To: Andrew Morton , Michael Ellerman , Benjamin Herrenschmidt , PowerPC Subject: linux-next: build failure after merge of the akpm-current tree Message-ID: <20170214165933.13ebd4f4@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Luis R. Rodriguez" , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Anju T Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi Andrew, After merging the akpm-current tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: arch/powerpc/lib/code-patching.c:61:16: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'is_conditional_branch' bool __kprobes is_conditional_branch(unsigned int instr) ^ Caused by commit 916c821aaf13 ("kprobes: move kprobe declarations to asm-generic/kprobes.h") interacting with commit 51c9c0843993 ("powerpc/kprobes: Implement Optprobes") from the powerpc tree. I have applied this merge fix patch for today: From: Stephen Rothwell Date: Tue, 14 Feb 2017 16:56:11 +1100 Subject: [PATCH] powerpc/kprobes: fixup for kprobes declarations moving Signed-off-by: Stephen Rothwell --- arch/powerpc/lib/code-patching.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c index 0899315e1434..0d3002b7e2b4 100644 --- a/arch/powerpc/lib/code-patching.c +++ b/arch/powerpc/lib/code-patching.c @@ -14,6 +14,7 @@ #include #include #include +#include int patch_instruction(unsigned int *addr, unsigned int instr)