Message ID | 20200624203200.78870-21-samitolvanen@google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=MW6C=AF=vger.kernel.org=linux-kbuild-owner@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6145A60D for <patchwork-linux-kbuild@patchwork.kernel.org>; Wed, 24 Jun 2020 20:33:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 48D912081A for <patchwork-linux-kbuild@patchwork.kernel.org>; Wed, 24 Jun 2020 20:33:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ZOpDZdrG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406608AbgFXUdz (ORCPT <rfc822;patchwork-linux-kbuild@patchwork.kernel.org>); Wed, 24 Jun 2020 16:33:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406600AbgFXUdg (ORCPT <rfc822;linux-kbuild@vger.kernel.org>); Wed, 24 Jun 2020 16:33:36 -0400 Received: from mail-qt1-x84a.google.com (mail-qt1-x84a.google.com [IPv6:2607:f8b0:4864:20::84a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C990C061797 for <linux-kbuild@vger.kernel.org>; Wed, 24 Jun 2020 13:33:35 -0700 (PDT) Received: by mail-qt1-x84a.google.com with SMTP id p9so2445734qtn.5 for <linux-kbuild@vger.kernel.org>; Wed, 24 Jun 2020 13:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=39oSk63TLcybcU14SgKvCDK3H6XzHtEtduXPCr/44ss=; b=ZOpDZdrGdHh1ZJonf0E/5dDbHERSe6TbCFmdB2U6jPIiwcNANMbLkyJvmpov2k2xOy UVWsqBFfeytL+Hgc/oR6FsAd9G11hUgAXJsCWawlND5MVBWd0mWD5Dc0EmC9ABVsRrwk SuNrnMuN7GhuqelKUl2otkPK4jEY0L0Bm6whau77q3fZbpcyNGO1mB7+EOqkQJEsefdW zLLLl7cpOUj8LxrFN5V51O7w7SPh0uXELCQRumvXzfHQsZ4xwEEn1hGOm5BLrbAhkADT mOeNJdhYt+ZgbwtN0PEW0MGrw4iretwo3Lq6tyaoaAFryjr8t8wGNBEOp88gmFSQ4dk6 T0OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=39oSk63TLcybcU14SgKvCDK3H6XzHtEtduXPCr/44ss=; b=fH0YF1XSuJL6CoUGN7HgBeIPxOWgOeai+gGo/YkdshVgA8aTcVw8g6Jpl60PHtMxVC u9cPe9gRHEaNdPEio8b4oSaDL7a3j2nrbN5wt6opr6M+HMPBjzu/AZin4GIGmBQ7Jo49 72nJKqrYvMAguBppg2CmoUJFIMY+Lah7j0HUc0ScbgpvEn1mfUj6vzs+a5mj4++w9pMh vTY17+h4GW8gndlUT88XnF2lvizfIBJafjHlNesYyE275V4gMVV6bqHSALN67pbGkS41 Vhyauz8bxd4q5k3gVR8TgBAzDKXMraKKT8r7M/pdTG8CcWJYdbizzytukm+1SB5ckfk4 zyWA== X-Gm-Message-State: AOAM533NuytbLDLid6e9fNLAQJ6VJv+Ahs3EB3kFslpODmZmxNdwUmun pbOfTognPq9LXJd5vrNoEDvh3WtrG7xodKXKsWk= X-Google-Smtp-Source: ABdhPJzI2BesdcUkxRPNmsNayE+wa07nV1TDxi5hKxZeEiEV2jo0nWBCJ/1Nmj0kWHXA23yigO5wL2sAexNblZcBJws= X-Received: by 2002:ad4:52e2:: with SMTP id p2mr33679309qvu.100.1593030814530; Wed, 24 Jun 2020 13:33:34 -0700 (PDT) Date: Wed, 24 Jun 2020 13:31:58 -0700 In-Reply-To: <20200624203200.78870-1-samitolvanen@google.com> Message-Id: <20200624203200.78870-21-samitolvanen@google.com> Mime-Version: 1.0 References: <20200624203200.78870-1-samitolvanen@google.com> X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog Subject: [PATCH 20/22] x86, ftrace: disable recordmcount for ftrace_make_nop From: Sami Tolvanen <samitolvanen@google.com> To: Masahiro Yamada <masahiroy@kernel.org>, Will Deacon <will@kernel.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Paul E. McKenney" <paulmck@kernel.org>, Kees Cook <keescook@chromium.org>, Nick Desaulniers <ndesaulniers@google.com>, clang-built-linux@googlegroups.com, kernel-hardening@lists.openwall.com, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, x86@kernel.org, Sami Tolvanen <samitolvanen@google.com> Content-Type: text/plain; charset="UTF-8" Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: <linux-kbuild.vger.kernel.org> X-Mailing-List: linux-kbuild@vger.kernel.org |
Series |
add support for Clang LTO
|
expand
|
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 51504566b3a6..c3b28b81277b 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -121,6 +121,7 @@ ftrace_modify_code_direct(unsigned long ip, const char *old_code, return 0; } +__nomcount int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec, unsigned long addr) { unsigned long ip = rec->ip;
Ignore mcount relocations in ftrace_make_nop. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> --- arch/x86/kernel/ftrace.c | 1 + 1 file changed, 1 insertion(+)