From patchwork Wed Aug 1 18:53:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 10552819 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7340D1708 for ; Wed, 1 Aug 2018 18:53:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6EE522B9F8 for ; Wed, 1 Aug 2018 18:53:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62BC82BA60; Wed, 1 Aug 2018 18:53:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 057122B9F8 for ; Wed, 1 Aug 2018 18:53:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731900AbeHAUkr (ORCPT ); Wed, 1 Aug 2018 16:40:47 -0400 Received: from mail-vk0-f73.google.com ([209.85.213.73]:53368 "EHLO mail-vk0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729924AbeHAUkq (ORCPT ); Wed, 1 Aug 2018 16:40:46 -0400 Received: by mail-vk0-f73.google.com with SMTP id x78-v6so8344994vkd.20 for ; Wed, 01 Aug 2018 11:53:37 -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=cWpRCNbR9wZRRO3Bu9vAA1N3rpTKgZMYLbuWcYGQ3hs=; b=EpT9O6J5umPO0tilCs1G43hmNepE5j2ixy8hXIC/1U7YFCq/Tw18osYKdrv75G004Z /9RrzYK8dEEcXDVxAAoPp5BD6tQhHXlDsEyv/Mo8sqx5JRfnNj4GqAO55bSYvVeQWd5P fmPLi3zMIauWJNThKDcL+c0KWxhGS9Zh/9o4xV9wy7F1uBAW6p/eOuA85siFDExbAwG6 CLnBJQqDRkfZsH62Tj1LPgKTn0x8QsP2XhO2h/2uHvtq60vXz7GdBmu1dJHHpcdSfN2A vjXqa5QaT4aBfVd93BjpYRSR6C3M0lzoIMyGXHFLiz37++6AgV8tGHAZJLaUh6Lwo7Sr GDcw== 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=cWpRCNbR9wZRRO3Bu9vAA1N3rpTKgZMYLbuWcYGQ3hs=; b=HLTe5R8MYTnrbo8TNfOouxdQB2uo2nw2PkBEfgVpWdv7+J8+HKWf6KNhISsmw+n76z /U+ZXZbtzwhQn7Hw/8oUWjZBhFqiEUyisVbdFjJVbmii6mj2tLn4aMgR9B21Qk8VKzbC 2PXeWfIhwyvnxgP5bNVwA/VxDUYsSlWz6qdMTX7hSIjj5eB30xPtMIXHoAaoUYQslnKg JpTeRyp/tsuPzQuyR0IpB5rpsR8yWqI+16JTTdXYVctacSoviHWAtOCY8S+B6CAwH9EO xFgay/M6Jrepc7PAL8GhkPPxEWq8S+eL/fdrZJb1v8Epywz95NB0VvIvfkLETS4XmNTk ji2g== X-Gm-Message-State: AOUpUlHDZ4Zd8itgngEMyj3FuKLKkFTBGhq2fQ631QrWKe8+jLeqZKtN juBe4PLcic8+nSyD4tpAmQnOE8V2K4YLe7y044M= X-Google-Smtp-Source: AAOMgpcAi0WCR5OeoHOvbSyZ/xInif3hjRzYYjODaLEJS9maNrcyFHx1EDgkwxFfZMLwEiw4w4guyD8KS9hPZPB+aAA= X-Received: by 2002:ab0:a8f:: with SMTP id d15-v6mr12630777uak.54.1533149617208; Wed, 01 Aug 2018 11:53:37 -0700 (PDT) Date: Wed, 1 Aug 2018 11:53:31 -0700 In-Reply-To: Message-Id: <20180801185331.39535-1-ndesaulniers@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-goog Subject: [PATCH v2] sh: prefer _THIS_IP_ to current_text_addr From: Nick Desaulniers To: ysato@users.sourceforge.jp, dalias@libc.org Cc: akpm@linux-foundation.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, Nick Desaulniers Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As part of the effort to reduce the code duplication between _THIS_IP_ and current_text_addr(), let's consolidate callers of current_text_addr() to use _THIS_IP_. Signed-off-by: Nick Desaulniers --- arch/sh/include/asm/kexec.h | 3 ++- arch/sh/kernel/dwarf.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/sh/include/asm/kexec.h b/arch/sh/include/asm/kexec.h index fd5f331a3912..927d80ba2332 100644 --- a/arch/sh/include/asm/kexec.h +++ b/arch/sh/include/asm/kexec.h @@ -4,6 +4,7 @@ #include #include +#include /* * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return. @@ -61,7 +62,7 @@ static inline void crash_setup_regs(struct pt_regs *newregs, __asm__ __volatile__ ("stc gbr, %0" : "=r" (newregs->gbr)); __asm__ __volatile__ ("stc sr, %0" : "=r" (newregs->sr)); - newregs->pc = (unsigned long)current_text_addr(); + newregs->pc = _THIS_IP_; } } #else diff --git a/arch/sh/kernel/dwarf.c b/arch/sh/kernel/dwarf.c index 1a2526676a87..bb511e2d9d68 100644 --- a/arch/sh/kernel/dwarf.c +++ b/arch/sh/kernel/dwarf.c @@ -599,7 +599,7 @@ struct dwarf_frame *dwarf_unwind_stack(unsigned long pc, * time this function makes its first function call. */ if (!pc || !prev) - pc = (unsigned long)current_text_addr(); + pc = _THIS_IP_; #ifdef CONFIG_FUNCTION_GRAPH_TRACER /*