From patchwork Wed Aug 1 18:22:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 10552797 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 7752C14E2 for ; Wed, 1 Aug 2018 18:23:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F4672BA25 for ; Wed, 1 Aug 2018 18:23:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 530092BA4F; Wed, 1 Aug 2018 18:23:19 +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 E7C592BA25 for ; Wed, 1 Aug 2018 18:23:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732297AbeHAUKQ (ORCPT ); Wed, 1 Aug 2018 16:10:16 -0400 Received: from mail-it0-f74.google.com ([209.85.214.74]:38772 "EHLO mail-it0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731500AbeHAUKL (ORCPT ); Wed, 1 Aug 2018 16:10:11 -0400 Received: by mail-it0-f74.google.com with SMTP id h5-v6so35900itb.3 for ; Wed, 01 Aug 2018 11:23:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=+KRME9vGAEtu01DjOm2vUaiwaXWnzR718tBHI+0fjAI=; b=TEEEeL0zTr5I3uxlqHGx7UY3VbGbbGCFOlgbJ3V4EQB57nndACqYvL9QOHLEooPEhz ynKHLuS48OVB/pf2iAy3/+OCkAjZo9dU3NGeJw2q+kFoifSM0dVr7U6VwBacQ6f+39gQ 6zUuHZGd2Wk8zR17KuCGLo8Hycqlk89iaLHXdsF+PsHt6iOJ1pwut6b7nR7lerZv60Yj 8D0eOUV+JNSSUDCfTISvWZJARKmwadzurrAZSKOOIB0yNQ8IIT3DBOQWYHE40uz1I2Uo tfSMfIKHKNiml6/QiHc/sQDY4BoE8CnNRxmryuxNYdQtqWaTPHY6qh9CZqnDpLUYwE2w GMPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=+KRME9vGAEtu01DjOm2vUaiwaXWnzR718tBHI+0fjAI=; b=j6XzPe8NekxzDVFArzZ5x4VwI2asmm/x8h/r5dqouu43lI22/WXk/FMvCrSsC+UyGZ 8lTwuTPY0EmL8hlsn6GyquqHdiL7Z0ohYiSAjyCLdr3WLsfJCrjXqXfT5Amh5rExZh7/ apWpP/rZCM+aXVDjizqbDefLv4BRDm4C+UG1rumi/WmtJo/QtzyWbQd15DvPwK3dyeRG wmhGgMz7xebFHJXH17RoruNH67KoreqD3t9ZPEW3QY4+7zsYDJSI/j+k2CXNhx2x1dlK o0YaiZ5PU/CNTM5k8Bo4Fzyu3tnlZNqhcIoSZL8fN9g8RNxNNTgt2ypD0DH5masfbN3I tYzg== X-Gm-Message-State: AOUpUlGW8L2Ze6jnCOoVdhvnxyVRY2PYQsjkUsEetES5ZO5bdzWH2vit +Adn1x4VwNwYi/wb4swx9offFV8ewhIYMj5g6qo= X-Google-Smtp-Source: AAOMgpd6aKEmwxJUK5Yr6mFiQo/VPEO3heAqb9NWO+azFVhN8k65odBj4zV+IWWuHwnwcsHCtQ/J8Hc8UPdHmgeV93A= X-Received: by 2002:a6b:1785:: with SMTP id 127-v6mr10409900iox.118.1533147791044; Wed, 01 Aug 2018 11:23:11 -0700 (PDT) Date: Wed, 1 Aug 2018 11:22:56 -0700 Message-Id: <20180801182258.17834-1-ndesaulniers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-goog Subject: [PATCH] parisc: prefer _THIS_IP_ and _RET_IP_ statement expressions From: Nick Desaulniers To: deller@gmx.de, jejb@parisc-linux.org Cc: natechancellor@gmail.com, Nick Desaulniers , Thomas Gleixner , Pravin Shedge , Kate Stewart , Greg Kroah-Hartman , linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@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/parisc/kernel/unwind.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c index 2ef83d78eec4..a4b430f440a9 100644 --- a/arch/parisc/kernel/unwind.c +++ b/arch/parisc/kernel/unwind.c @@ -439,8 +439,8 @@ unsigned long return_address(unsigned int level) /* initialize unwind info */ asm volatile ("copy %%r30, %0" : "=r"(sp)); memset(&r, 0, sizeof(struct pt_regs)); - r.iaoq[0] = (unsigned long) current_text_addr(); - r.gr[2] = (unsigned long) __builtin_return_address(0); + r.iaoq[0] = _THIS_IP_; + r.gr[2] = _RET_IP_; r.gr[30] = sp; unwind_frame_init(&info, current, &r);