From patchwork Tue Dec 19 10:12:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 122360 Delivered-To: patch@linaro.org Received: by 10.80.152.193 with SMTP id j59csp3841886edb; Tue, 19 Dec 2017 02:13:11 -0800 (PST) X-Google-Smtp-Source: ACJfBouQiLgVPMWE4YISubdEv34OXFeOuJ85wov4Xocp8Uslqynsyrf3qyTzidA7P9h4RzhK3Rt1 X-Received: by 10.98.11.71 with SMTP id t68mr2689587pfi.79.1513678391238; Tue, 19 Dec 2017 02:13:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513678391; cv=none; d=google.com; s=arc-20160816; b=GBzdK3Ar58KHuaAH7II2kti22nYDl602yHiQf+tKDwAK5yIF5tq8PWAiTQ+ztVzXYN /6l9E2g69fJa767VavU5H8qJRI6iyswPHE7U+m3SmP+lTjXmSjNWgzMtEeaF4g1O/s2C F5u6yKfv7/KrWD+x44RYZKAIqHu5pB1CEirtn0xT9HXd7XQdVUniU/W688yXc378ZTiE 76xNOERV/ieu+Aak2AKdBOtEaFU5nmhd30ndokZgL3hO6ubBqwLd7Kv4q3s8rNmoLhRQ 3zyauMzkgkBcQVqtYRpytWkonetu1xpByWpoIw90WFqQRZS8wlqLJapX7ktpRzHkVGEV EHpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=e8mkQYDNFiNdN/agwm7SyPLBuZYm+DIPkw/Vbvgisec=; b=wvYWahh91xiRzy5sfzU5X8Ro0jFY6tvooF3pMTcGxN08MXAkjQKdVKGAjZsQwfyb70 O/bsqHnRybhRW6CSwteVnI9CJFGzcW8jfBHKNe5dNk5U1LSIeNjTiAIx0lmiyW0YHGRq Asyzgz9rV4kEtXKevl29Tn36DRTnDPAtU/3LzBs0MP80wJPEk/qqx4zR7aSzXbWkVFgU pdkBt1DS4he7aCQd9mh0aP321OmoX9AvSgsvvxQFbgUdOJft7tu1ZrtPrQqtGwC0gMb1 p8x2pT9zz580D8JwWTUrVZKBu+gsT2EsPnRPHS9fBo4jCKiT5LkUStTJjdTfk41p+1E4 CRRA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t10si8912948plr.744.2017.12.19.02.13.10; Tue, 19 Dec 2017 02:13:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030267AbdLSKNH (ORCPT + 28 others); Tue, 19 Dec 2017 05:13:07 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:58633 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S939035AbdLSKMw (ORCPT ); Tue, 19 Dec 2017 05:12:52 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0LtBoV-1f7d4k0CNf-012rbS; Tue, 19 Dec 2017 11:12:33 +0100 From: Arnd Bergmann To: Steven Rostedt , Ingo Molnar Cc: Arnd Bergmann , Alexei Starovoitov , Josef Bacik , linux-kernel@vger.kernel.org Subject: [PATCH] bpf: fix BPF_KPROBE_OVERRIDE dependencies Date: Tue, 19 Dec 2017 11:12:04 +0100 Message-Id: <20171219101231.2139885-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:fMxhZxBFxauZpPXsF2H6xTwO9inT6HZFaKAoJCvr4NUMYdmvJK9 b4w9ehqiRiXqRrmUGz57CIqoOrfImwkW3YgeFKq2lqWU9iYdNTW4q2egJKOlPB79+cMwmPT yC7WG48BhDLrJKFPt2yVXOzC5LcpQNmLdjP20vzejYSA11Ate0O4+bmpuU0PFqki4j1dLkf /ZJ6yEP9OvfwRLUpvuR8A== X-UI-Out-Filterresults: notjunk:1; V01:K0:YQfVoPNBqHQ=:yE+0al+MJ5cWWgrzwRmNn/ XkPM6DszBK9/mKGu+1biT9vcEMxU4Yy/0NmUxpzMWbfVHlb/BH2YNk5B6anKjm0OmrznAcZVY P4yhpsPp8QLsIOW3Z3ydS68LjqAA2oI2APocBK4q00IlIgPJnBeABqC7aWhRbCpmZenlICwqk wGXwRc2NR3UxX6vdoJ/WBD5Dim8Y1AqjUcAicR1FOmYQ5oCPfHbOftntt6JYONXTs6Dk3ZRdj GIyfHYKe9l9eQg/Yw6aMWUNKtrBr4PMEER5xpKdemDjml58ifLL5Fc67litKJfU7DW2aSgxLt UzV+qjgYnloQ08EWl2Mu+l+kc4BX4VB/6VQZZq96jxWeHqvlt3lFUQxb/VuXMuKo45CLdC7Ub KIO9k0lWv0veBmUL9yxiVwxdgah0M/1qtUFhUr/TVqlTQxJ0nYXtfF0IZmC3sG+jNa970el26 kEQNKj2knIIMVJOMOrR6Mc7vjqjkpB4LY1IH8Ih94zw/ZLi6K2XT7bhjVae6gz8mubhuUK2GE mbu+9mrgyti7GQjtdDHQfBH5/5EJ26K3PTlFWlvOmRY1a6GwpxIXSnVkOgVTYtA8yxa26cCAj 0VBI3R8IB/d5ZLBombHqMGlxmr2kcTRNKarXn2VuWydD32GpaJ1RHLVdxmzcB5OJ81KfE2zSa YuydfDSBg9YHZ74s3uh9VlifszsHLmNMn1gZIRCDiGo+YeHqCnREXPoKIwjEzwoUjF+f8piqk kkGPY0BQPorZlspeCDDvfGBhShAaH9QjpXNH8Q== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_BPF_KPROBE_OVERRIDE causes a link failure when CONFIG_KPROBE_EVENTS is disabled: kernel/trace/bpf_trace.o: In function `bpf_override_return': (.text+0x172): undefined reference to `bpf_kprobe_override' This adds it to the list of dependencies. Fixes: 9802d86585db ("bpf: add a bpf_override_function helper") Signed-off-by: Arnd Bergmann --- kernel/trace/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index ace4547b7564..0d83668652ef 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -534,6 +534,7 @@ config FUNCTION_PROFILER config BPF_KPROBE_OVERRIDE bool "Enable BPF programs to override a kprobed function" depends on BPF_EVENTS + depends on KPROBE_EVENTS depends on KPROBES_ON_FTRACE depends on HAVE_KPROBE_OVERRIDE depends on DYNAMIC_FTRACE_WITH_REGS