Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3897731rwa; Tue, 23 Aug 2022 12:06:20 -0700 (PDT) X-Google-Smtp-Source: AA6agR5ZSFMhtipSxERlk/WcZAh8RI9cHSe+x2fB8Pb7kQFAWfeusXy89UmyvCz4Hov4sI/9v6pU X-Received: by 2002:a17:90b:1e4a:b0:1f5:4f69:d6b4 with SMTP id pi10-20020a17090b1e4a00b001f54f69d6b4mr4613056pjb.164.1661281580058; Tue, 23 Aug 2022 12:06:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661281580; cv=none; d=google.com; s=arc-20160816; b=WTWMs45LouvVKUNbXPEgKEWgXgB0zisYAqGyVvk1HUJ6mJIC4NR0jsJOtNhmw/uxqi 71wrxoLDcJm6LgQW+5eXUPOwC6QXFzuGwcNDK1bRvT0w3HRo3lOIBGxNFKR17HI2H+jD BMKHwIkclzAKfRsWzuvvKl8jEZ0fR/osp9Cu1SQMB/belYoujHxJg+rOfxtmQ25PVl3m oYyqnIdFffRFTcxDmwTZ4/WWMYzc1r430kMVLVUvPhPgqoSV6jTs4HJVUpJKKftODJDO DJ5cncs8M/qkmf91lcTk1AXcoybE93A14fYnrAf+EFKl2HQPnBMTHC6uVOmw5yJFW3o4 RusQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=tqdScFptOakoXLqgWnc7y3yzfrOnbDFzTgMMGAudY7M=; b=EzNLKwpxl6dO4fdkiOQYbZKZOZastXtxqe6H1yfEUrEgHUl+QMODYj4KTj8HlcE5Mo ShLc2JQoFtPusoqLVprIE67qXleg1QxxccTa1tvySTyE1dQhCk9DxgfKNkMY1saviEo7 Jqm3iKnhg3mDMwHTt1iJCuon0N8HJum9SJn2fWLrDN6kOGctBDpgb4AEFFbnwhlrI8di 90RVLNCZwASltKdBnfvnlOzWyVqR9qClCmxENNS47FJlLdSrBQ7MYrmhxdgPgPlsBrcj McZGNp6RtdzjZMBwpZgWftEa8LO8E8E0Hrx5Vjg4MLMhwrb+xP+MxiCL/kdyMvmFxB+M 347A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p4-20020a170902a40400b00170d34b95e0si14558235plq.85.2022.08.23.12.06.08; Tue, 23 Aug 2022 12:06:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344043AbiHWRHz (ORCPT + 99 others); Tue, 23 Aug 2022 13:07:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344868AbiHWRGF (ORCPT ); Tue, 23 Aug 2022 13:06:05 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F99512B057 for ; Tue, 23 Aug 2022 06:34:51 -0700 (PDT) Received: from dggpemm500022.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MBqr81mPrzkWSD; Tue, 23 Aug 2022 21:31:20 +0800 (CST) Received: from dggpemm500013.china.huawei.com (7.185.36.172) by dggpemm500022.china.huawei.com (7.185.36.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 23 Aug 2022 21:34:49 +0800 Received: from ubuntu1804.huawei.com (10.67.175.36) by dggpemm500013.china.huawei.com (7.185.36.172) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 23 Aug 2022 21:34:35 +0800 From: Chen Zhongjin To: , CC: , , , , , , , Subject: [PATCH] objtool: replace _ASM_PTR with quad in macros Date: Tue, 23 Aug 2022 21:31:24 +0800 Message-ID: <20220823133124.55914-1-chenzhongjin@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.175.36] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500013.china.huawei.com (7.185.36.172) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Macros STACK_FRAME_NON_STANDARD and ANNOTATE_NOENDBR uses _ASM_PTR. It switch between .long and .quad based on 32bit or 64bit. However objtool doesn't work for 32bit, so _ASM_PTR makes no sense. Considering that _ASM_PTR comes from asm.h, which is x86 specific head file, while objtool.h is generic. Replace _ASM_PTR with quad and remove asm.h reference. Signed-off-by: Chen Zhongjin --- include/linux/objtool.h | 6 ++---- tools/include/linux/objtool.h | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/linux/objtool.h b/include/linux/objtool.h index 62c54ffbeeaa..d2413cb78037 100644 --- a/include/linux/objtool.h +++ b/include/linux/objtool.h @@ -45,8 +45,6 @@ struct unwind_hint { #ifdef CONFIG_OBJTOOL -#include - #ifndef __ASSEMBLY__ #define UNWIND_HINT(sp_reg, sp_offset, type, end) \ @@ -87,7 +85,7 @@ struct unwind_hint { #define ANNOTATE_NOENDBR \ "986: \n\t" \ ".pushsection .discard.noendbr\n\t" \ - _ASM_PTR " 986b\n\t" \ + ".quad 986b\n\t" \ ".popsection\n\t" #define ASM_REACHABLE \ @@ -144,7 +142,7 @@ struct unwind_hint { .macro STACK_FRAME_NON_STANDARD func:req .pushsection .discard.func_stack_frame_non_standard, "aw" - _ASM_PTR \func + .quad \func .popsection .endm diff --git a/tools/include/linux/objtool.h b/tools/include/linux/objtool.h index 62c54ffbeeaa..d2413cb78037 100644 --- a/tools/include/linux/objtool.h +++ b/tools/include/linux/objtool.h @@ -45,8 +45,6 @@ struct unwind_hint { #ifdef CONFIG_OBJTOOL -#include - #ifndef __ASSEMBLY__ #define UNWIND_HINT(sp_reg, sp_offset, type, end) \ @@ -87,7 +85,7 @@ struct unwind_hint { #define ANNOTATE_NOENDBR \ "986: \n\t" \ ".pushsection .discard.noendbr\n\t" \ - _ASM_PTR " 986b\n\t" \ + ".quad 986b\n\t" \ ".popsection\n\t" #define ASM_REACHABLE \ @@ -144,7 +142,7 @@ struct unwind_hint { .macro STACK_FRAME_NON_STANDARD func:req .pushsection .discard.func_stack_frame_non_standard, "aw" - _ASM_PTR \func + .quad \func .popsection .endm -- 2.17.1