From patchwork Thu Oct 13 02:07:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 681565 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 AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3svZCT60Cgz9sD6 for ; Thu, 13 Oct 2016 13:18:29 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=rVQwvE3y; 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 3svZCT4mfJzDvHG for ; Thu, 13 Oct 2016 13:18:29 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=rVQwvE3y; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3svYyj5mN5zDt0t for ; Thu, 13 Oct 2016 13:07:25 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=rVQwvE3y; dkim-atps=neutral Received: by mail-pf0-x242.google.com with SMTP id s8so3882293pfj.2 for ; Wed, 12 Oct 2016 19:07:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=gj9b2d8c5iFD56cctZHDxBlmnm8hK7M7DTHPhPcGgac=; b=rVQwvE3yzDREhyU1RO4jJXspX+6uR5xk8as3IT5hsPlybREJXxGDEVx31ZWbHC+4gx 3V3+9DNrZcalU4RS5/IR6B6hl2XkkhqWrRUtt7QALcdBJCCIosxZu1WbvKGMPzAyB93S koDtbgA1452aQkhwzCmOJbpv0lv1j0fXX3JhQVAIZ1+fET6Xo9YXGfM2sC0Wp5rjMViZ 2CSQgXU/9at5vKkwwBTUMP6Tjdb0OlEUzbko1hFWPLbuB015slmminq2g2wCSmb+olHS UGfUhamYDc1Psd7Erc8VbVYaXOwZ19XU7GpBBj3rRRefAMqA3VHrX1ve0Wa1T2k9iYn0 P4wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=gj9b2d8c5iFD56cctZHDxBlmnm8hK7M7DTHPhPcGgac=; b=fhltS6OQFRv31zYpm7PdIYIDKc56yt8d4lmH6sJ5w+pQmqtjKTkmNsu8Dta2TQFFG+ 5ksCZvjFWDNs/xWq7E2u8aE9GKZMuqVSgYblJEGw0iClt82raDzGshBhJbTX60fmT141 m8QdbGY4vyS/kQthc+aguO4wvGQRr9j0Bk8T9+LCK3YQq5mPvj9ur7uxPQKP0AvneZO8 xfScgsg6L5EDbQU7rzUy5R6SFXdEuSSWvk5KE3V2+m5Ch1cAtVVfNU+XhqPz/pZ54Qei kShDl+DQEAdvl0p3LnPqwueFFF4CTsf2XGiswc0q/Gn3dCk+sOEpVivCnbQ39YQdAWud Q0uA== X-Gm-Message-State: AA6/9RlTeZS2bHBzkzBbMjCTKnLLRnTrdhlyYf9SOcIwo8kubsJ9uap9+5L5Im8DXrn1xg== X-Received: by 10.98.41.3 with SMTP id p3mr1892179pfp.92.1476324443830; Wed, 12 Oct 2016 19:07:23 -0700 (PDT) Received: from roar.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id j5sm183959pad.25.2016.10.12.19.07.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Oct 2016 19:07:23 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH] powerpc: make _ASM_NOKPROBE_SYMBOL a noop when KPROBES not defined Date: Thu, 13 Oct 2016 13:07:14 +1100 Message-Id: <20161013020714.5629-1-npiggin@gmail.com> X-Mailer: git-send-email 2.9.3 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: Nicholas Piggin Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Nicholas Piggin Acked-by: Balbir Singh --- The linker orphan sections error patch caught this arch/powerpc/include/asm/ppc_asm.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h index c73750b..ceec199 100644 --- a/arch/powerpc/include/asm/ppc_asm.h +++ b/arch/powerpc/include/asm/ppc_asm.h @@ -265,10 +265,14 @@ GLUE(.,name): * latter is for those that incdentially must be excluded from probing * and allows them to be linked at more optimal location within text. */ +#ifdef CONFIG_KPROBES #define _ASM_NOKPROBE_SYMBOL(entry) \ .pushsection "_kprobe_blacklist","aw"; \ PPC_LONG (entry) ; \ .popsection +#else +#define _ASM_NOKPROBE_SYMBOL(entry) +#endif #define FUNC_START(name) _GLOBAL(name) #define FUNC_END(name)