From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79A9DC3F2D2 for ; Fri, 28 Feb 2020 12:41:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D8BF246A3 for ; Fri, 28 Feb 2020 12:41:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="H32BlYxS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725802AbgB1Mlf (ORCPT ); Fri, 28 Feb 2020 07:41:35 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:38143 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725730AbgB1Mlf (ORCPT ); Fri, 28 Feb 2020 07:41:35 -0500 Received: by mail-wr1-f68.google.com with SMTP id e8so2797460wrm.5 for ; Fri, 28 Feb 2020 04:41:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=XBS4xJeronFByco7hvqXXCJEpIN3x2l+h2xMS+Qu5VY=; b=H32BlYxSp7yeOYKrV+18Kq0+YS+hSAOrzWo3T6WyqnHTkd0LkP8qZjWhS1n5//SwFO 7yqusqGjdG8VA3A/7qaHEYn0+6hAzJjGiZP0lNj1456ePdSkYU7BMpxhz6GoBcLHXIwK gOzyaCW0Xns5tOdyob4OhuPjbYcfHcOq8e2QURnGhwq0UeBw+sOpJ/73uaprMNuuTXF2 iLn1W4nYHLZRS1rRnPYzYVj4gQhwMs+x+nlNaP6uYErNFT5JWSv4K6IuZx8CbGFP59Z9 7CKW+egRaz8fyaTmNtvzCa3R7Hm0PSt6mS5JhRgXArF0qCOJnOgLCizqVEszVt+wk5Y1 gojA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XBS4xJeronFByco7hvqXXCJEpIN3x2l+h2xMS+Qu5VY=; b=OWIk7mz95JZ/HnS+rOcPxW33+YUTqZ80wSstyqSXw1cx+SQ6yx6Wg92Yk3ns9xrhjE j9l3OQSmTAxEZVyreZV0JCt2LBOgbPp3uD11Tm9ixgWellShcyylc6i/PYTR/3/S7io/ Q9+RoZFw2G3Uv763Xan8x36e91iU/tTjV75ntFiuyEkG7qvM4tX1mJBIPi0XlQd8AEko N7quBOj8JJaRwXyIFaKQjNomp39W77jVjoQYrj9HKPo808U4Ef4vTBBPk8074vJ7riLd GJZlIjNCNxoxbmDIfBqJmEH8C9whCZ3oNYXXiUnFm9wPFVJl85cSRZ+MQhT11IRd/chQ AdWA== X-Gm-Message-State: APjAAAXAzawsuIVUteNEtKqwAA3E9ydPugKZ4nBahJhi4LT+4CnnJx1C 4jAO9hWzBGlEsQnq0HSuXSb7ascA69tQMBKWxqMZ5Q== X-Google-Smtp-Source: APXvYqycHr5BpR7YsHapDHRDF5PvvknfNJGfaHFydphDQrJgW+V3mYRdB8mumbWLaqIy7fTmjqZ4VZ0ui5GjrBMPKsg= X-Received: by 2002:adf:f84a:: with SMTP id d10mr4811332wrq.208.1582893691834; Fri, 28 Feb 2020 04:41:31 -0800 (PST) MIME-Version: 1.0 References: <20200218195842.34156-1-broonie@kernel.org> <20200218195842.34156-13-broonie@kernel.org> In-Reply-To: <20200218195842.34156-13-broonie@kernel.org> From: Ard Biesheuvel Date: Fri, 28 Feb 2020 13:41:21 +0100 Message-ID: Subject: Re: [PATCH 12/18] arm64: kernel: Convert to modern annotations for assembly functions To: Mark Brown Cc: Herbert Xu , "David S. Miller" , Catalin Marinas , Will Deacon , Marc Zyngier , James Morse , Julien Thierry , Suzuki K Poulose , kvmarm , linux-arm-kernel , "open list:HARDWARE RANDOM NUMBER GENERATOR CORE" Content-Type: text/plain; charset="UTF-8" Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Hi Mark, On Tue, 18 Feb 2020 at 21:02, Mark Brown wrote: > > In an effort to clarify and simplify the annotation of assembly functions > in the kernel new macros have been introduced. These replace ENTRY and > ENDPROC and also add a new annotation for static functions which previously > had no ENTRY equivalent. Update the annotations in the core kernel code to > the new macros. > > Signed-off-by: Mark Brown > --- > arch/arm64/kernel/cpu-reset.S | 4 +- > arch/arm64/kernel/efi-entry.S | 4 +- > arch/arm64/kernel/efi-rt-wrapper.S | 4 +- > arch/arm64/kernel/entry-fpsimd.S | 20 ++++----- > arch/arm64/kernel/hibernate-asm.S | 16 +++---- > arch/arm64/kernel/hyp-stub.S | 20 ++++----- > arch/arm64/kernel/probes/kprobes_trampoline.S | 4 +- > arch/arm64/kernel/reloc_test_syms.S | 44 +++++++++---------- > arch/arm64/kernel/relocate_kernel.S | 4 +- > arch/arm64/kernel/sleep.S | 12 ++--- > arch/arm64/kernel/smccc-call.S | 8 ++-- > 11 files changed, 70 insertions(+), 70 deletions(-) > ... > diff --git a/arch/arm64/kernel/efi-entry.S b/arch/arm64/kernel/efi-entry.S > index 304d5b02ca67..de6ced92950e 100644 > --- a/arch/arm64/kernel/efi-entry.S > +++ b/arch/arm64/kernel/efi-entry.S > @@ -25,7 +25,7 @@ > * we want to be. The kernel image wants to be placed at TEXT_OFFSET > * from start of RAM. > */ > -ENTRY(entry) > +SYM_CODE_START(entry) > /* > * Create a stack frame to save FP/LR with extra space > * for image_addr variable passed to efi_entry(). > @@ -117,4 +117,4 @@ efi_load_fail: > ret > > entry_end: > -ENDPROC(entry) > +SYM_CODE_END(entry) This hunk is going to conflict badly with the EFI tree. I will incorporate this change for v5.7, so could you please just drop it from this patch? From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A421C3F2D3 for ; Fri, 28 Feb 2020 12:41:38 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id C39FC246A3 for ; Fri, 28 Feb 2020 12:41:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="H32BlYxS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C39FC246A3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 399114AFE8; Fri, 28 Feb 2020 07:41:37 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@linaro.org Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ug7pZ14Pbt47; Fri, 28 Feb 2020 07:41:36 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 1547B4AF07; Fri, 28 Feb 2020 07:41:36 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 09E0C4AFC5 for ; Fri, 28 Feb 2020 07:41:34 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LpLwhpiJswrC for ; Fri, 28 Feb 2020 07:41:33 -0500 (EST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id E940F4AF86 for ; Fri, 28 Feb 2020 07:41:32 -0500 (EST) Received: by mail-wr1-f66.google.com with SMTP id r7so2820564wro.2 for ; Fri, 28 Feb 2020 04:41:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=XBS4xJeronFByco7hvqXXCJEpIN3x2l+h2xMS+Qu5VY=; b=H32BlYxSp7yeOYKrV+18Kq0+YS+hSAOrzWo3T6WyqnHTkd0LkP8qZjWhS1n5//SwFO 7yqusqGjdG8VA3A/7qaHEYn0+6hAzJjGiZP0lNj1456ePdSkYU7BMpxhz6GoBcLHXIwK gOzyaCW0Xns5tOdyob4OhuPjbYcfHcOq8e2QURnGhwq0UeBw+sOpJ/73uaprMNuuTXF2 iLn1W4nYHLZRS1rRnPYzYVj4gQhwMs+x+nlNaP6uYErNFT5JWSv4K6IuZx8CbGFP59Z9 7CKW+egRaz8fyaTmNtvzCa3R7Hm0PSt6mS5JhRgXArF0qCOJnOgLCizqVEszVt+wk5Y1 gojA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XBS4xJeronFByco7hvqXXCJEpIN3x2l+h2xMS+Qu5VY=; b=M3g5bpPAYJ91KQcKXWEyTksGnsthwdigQoYIH+AYSKszEqVwS+j6GSG/Tn9hEMWtyk 9J6M6Wljb+6w5WoIRKMaJxnef1Y+/iLlPUwt7pQl752d0hHZj0Y6QrvYDrsJjO+grN4J XHFocfZmj4+u8lUOPv6NECmJ+Tt0S8udSjg9HCQONl8NWk0HmmK2MSj98+jvq9/dIQPU nBOBQbctoj5Ra0b8FEkMQAMRw913M+SeMUIaXYPVeuslk19IGYFzTf5tvgRSjNClu8TR ilSGwI/hvmNeGSxlyCsGu6gSOVOzRE3sHC0HmvgKo4vRRKOQbLh9PRayVsvQJ9nwDgyH pQKQ== X-Gm-Message-State: APjAAAVdEcOryu89jIXR21BMvQGqq6Ve6sLD+ioAdzZffCJRTKmNxt00 d9Utl62QPbfIks3mEg7JUIXJCMFoOTAHVpjRJfa6HA== X-Google-Smtp-Source: APXvYqycHr5BpR7YsHapDHRDF5PvvknfNJGfaHFydphDQrJgW+V3mYRdB8mumbWLaqIy7fTmjqZ4VZ0ui5GjrBMPKsg= X-Received: by 2002:adf:f84a:: with SMTP id d10mr4811332wrq.208.1582893691834; Fri, 28 Feb 2020 04:41:31 -0800 (PST) MIME-Version: 1.0 References: <20200218195842.34156-1-broonie@kernel.org> <20200218195842.34156-13-broonie@kernel.org> In-Reply-To: <20200218195842.34156-13-broonie@kernel.org> From: Ard Biesheuvel Date: Fri, 28 Feb 2020 13:41:21 +0100 Message-ID: Subject: Re: [PATCH 12/18] arm64: kernel: Convert to modern annotations for assembly functions To: Mark Brown Cc: Herbert Xu , Catalin Marinas , kvmarm , linux-arm-kernel , Marc Zyngier , Will Deacon , "David S. Miller" , "open list:HARDWARE RANDOM NUMBER GENERATOR CORE" X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu Hi Mark, On Tue, 18 Feb 2020 at 21:02, Mark Brown wrote: > > In an effort to clarify and simplify the annotation of assembly functions > in the kernel new macros have been introduced. These replace ENTRY and > ENDPROC and also add a new annotation for static functions which previously > had no ENTRY equivalent. Update the annotations in the core kernel code to > the new macros. > > Signed-off-by: Mark Brown > --- > arch/arm64/kernel/cpu-reset.S | 4 +- > arch/arm64/kernel/efi-entry.S | 4 +- > arch/arm64/kernel/efi-rt-wrapper.S | 4 +- > arch/arm64/kernel/entry-fpsimd.S | 20 ++++----- > arch/arm64/kernel/hibernate-asm.S | 16 +++---- > arch/arm64/kernel/hyp-stub.S | 20 ++++----- > arch/arm64/kernel/probes/kprobes_trampoline.S | 4 +- > arch/arm64/kernel/reloc_test_syms.S | 44 +++++++++---------- > arch/arm64/kernel/relocate_kernel.S | 4 +- > arch/arm64/kernel/sleep.S | 12 ++--- > arch/arm64/kernel/smccc-call.S | 8 ++-- > 11 files changed, 70 insertions(+), 70 deletions(-) > ... > diff --git a/arch/arm64/kernel/efi-entry.S b/arch/arm64/kernel/efi-entry.S > index 304d5b02ca67..de6ced92950e 100644 > --- a/arch/arm64/kernel/efi-entry.S > +++ b/arch/arm64/kernel/efi-entry.S > @@ -25,7 +25,7 @@ > * we want to be. The kernel image wants to be placed at TEXT_OFFSET > * from start of RAM. > */ > -ENTRY(entry) > +SYM_CODE_START(entry) > /* > * Create a stack frame to save FP/LR with extra space > * for image_addr variable passed to efi_entry(). > @@ -117,4 +117,4 @@ efi_load_fail: > ret > > entry_end: > -ENDPROC(entry) > +SYM_CODE_END(entry) This hunk is going to conflict badly with the EFI tree. I will incorporate this change for v5.7, so could you please just drop it from this patch? _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A17CC3F2D1 for ; Fri, 28 Feb 2020 12:41:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0016F246AF for ; Fri, 28 Feb 2020 12:41:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="q1El2+eq"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="H32BlYxS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0016F246AF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LaFyzcdxcFQevDfUlqc43VYz5qAF8rSrPOJ/k5m7bWU=; b=q1El2+eqdka/ri gtipyoVSUAdzDA6I4xrKJXvdM8C9nAG7L9VntA4YdqLZzPsMLt8TZVyHRP5+9PJlFJzMZDd3TKrF3 0bDd8hS0gkH3zWI9Hfx0vrUWU+zIPpK9WaRbCWB1ugeAg0ssgHzgjNADlWV8qJpg9Wen3BDxrt4lj bPArqWRnfDsb5lILgTh39n9H0uFL4XqlCiGZbcmCWOwHUi7q5ybIZ6TDXYHpbmBBpwS4QOLC1qc72 Dxl3kzLOtSAR+5YQbQXY1e7ln53ZvpL9tXKzpk4scjn2Mc1UGKbW1EwW1IxNGjmEXlxHUWeGfBe5I BCl948/wuP0kjGI7zcuA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j7exV-0006zQ-TL; Fri, 28 Feb 2020 12:41:37 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j7exS-0006z1-0I for linux-arm-kernel@lists.infradead.org; Fri, 28 Feb 2020 12:41:36 +0000 Received: by mail-wr1-x441.google.com with SMTP id y17so2791563wrn.6 for ; Fri, 28 Feb 2020 04:41:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=XBS4xJeronFByco7hvqXXCJEpIN3x2l+h2xMS+Qu5VY=; b=H32BlYxSp7yeOYKrV+18Kq0+YS+hSAOrzWo3T6WyqnHTkd0LkP8qZjWhS1n5//SwFO 7yqusqGjdG8VA3A/7qaHEYn0+6hAzJjGiZP0lNj1456ePdSkYU7BMpxhz6GoBcLHXIwK gOzyaCW0Xns5tOdyob4OhuPjbYcfHcOq8e2QURnGhwq0UeBw+sOpJ/73uaprMNuuTXF2 iLn1W4nYHLZRS1rRnPYzYVj4gQhwMs+x+nlNaP6uYErNFT5JWSv4K6IuZx8CbGFP59Z9 7CKW+egRaz8fyaTmNtvzCa3R7Hm0PSt6mS5JhRgXArF0qCOJnOgLCizqVEszVt+wk5Y1 gojA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XBS4xJeronFByco7hvqXXCJEpIN3x2l+h2xMS+Qu5VY=; b=C6LaLFbaBQvvqdQdCHmuq+9ZexJtI8CfBINHhdvsatFroJx/896chV51F1K6OBstYt FnFGa0GMLGNx3YeKIrPHiCEcc5ezy0oruk661Y0fzl3ViSVDTUgJylQ8W6B/5iJCVbbf 0TE/1gCzsAs+nkGCISLHbVnMQUEAEO8EQo6KzECOheSqjkff5ZJAvRMeK7Gz2nF8W45c XNIJfRyor8d4c+HWc1oq5jSdLJHAlEhR2lC55L2p3C7YK5DKT9qUnS8QMrMU6kvwOmVd XMOCdv42Lk590kQoPRCKa3u0dR5nOYBIzFaN12oWFGbKEMQKNZKIJwMPNFci4RTYPJgB hbXA== X-Gm-Message-State: APjAAAX3y0rcw51OMOQ1qnmjE+JpyECPrSfBTZfRFtwbgrSI+4f0bVoA AbaMKvtKDCNhzLFT71LYrYNTNzQRg7tD9K1QBbaumQ== X-Google-Smtp-Source: APXvYqycHr5BpR7YsHapDHRDF5PvvknfNJGfaHFydphDQrJgW+V3mYRdB8mumbWLaqIy7fTmjqZ4VZ0ui5GjrBMPKsg= X-Received: by 2002:adf:f84a:: with SMTP id d10mr4811332wrq.208.1582893691834; Fri, 28 Feb 2020 04:41:31 -0800 (PST) MIME-Version: 1.0 References: <20200218195842.34156-1-broonie@kernel.org> <20200218195842.34156-13-broonie@kernel.org> In-Reply-To: <20200218195842.34156-13-broonie@kernel.org> From: Ard Biesheuvel Date: Fri, 28 Feb 2020 13:41:21 +0100 Message-ID: Subject: Re: [PATCH 12/18] arm64: kernel: Convert to modern annotations for assembly functions To: Mark Brown X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200228_044134_108120_AC41F6E3 X-CRM114-Status: GOOD ( 16.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Herbert Xu , Suzuki K Poulose , Catalin Marinas , kvmarm , James Morse , linux-arm-kernel , Marc Zyngier , Will Deacon , "David S. Miller" , Julien Thierry , "open list:HARDWARE RANDOM NUMBER GENERATOR CORE" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Mark, On Tue, 18 Feb 2020 at 21:02, Mark Brown wrote: > > In an effort to clarify and simplify the annotation of assembly functions > in the kernel new macros have been introduced. These replace ENTRY and > ENDPROC and also add a new annotation for static functions which previously > had no ENTRY equivalent. Update the annotations in the core kernel code to > the new macros. > > Signed-off-by: Mark Brown > --- > arch/arm64/kernel/cpu-reset.S | 4 +- > arch/arm64/kernel/efi-entry.S | 4 +- > arch/arm64/kernel/efi-rt-wrapper.S | 4 +- > arch/arm64/kernel/entry-fpsimd.S | 20 ++++----- > arch/arm64/kernel/hibernate-asm.S | 16 +++---- > arch/arm64/kernel/hyp-stub.S | 20 ++++----- > arch/arm64/kernel/probes/kprobes_trampoline.S | 4 +- > arch/arm64/kernel/reloc_test_syms.S | 44 +++++++++---------- > arch/arm64/kernel/relocate_kernel.S | 4 +- > arch/arm64/kernel/sleep.S | 12 ++--- > arch/arm64/kernel/smccc-call.S | 8 ++-- > 11 files changed, 70 insertions(+), 70 deletions(-) > ... > diff --git a/arch/arm64/kernel/efi-entry.S b/arch/arm64/kernel/efi-entry.S > index 304d5b02ca67..de6ced92950e 100644 > --- a/arch/arm64/kernel/efi-entry.S > +++ b/arch/arm64/kernel/efi-entry.S > @@ -25,7 +25,7 @@ > * we want to be. The kernel image wants to be placed at TEXT_OFFSET > * from start of RAM. > */ > -ENTRY(entry) > +SYM_CODE_START(entry) > /* > * Create a stack frame to save FP/LR with extra space > * for image_addr variable passed to efi_entry(). > @@ -117,4 +117,4 @@ efi_load_fail: > ret > > entry_end: > -ENDPROC(entry) > +SYM_CODE_END(entry) This hunk is going to conflict badly with the EFI tree. I will incorporate this change for v5.7, so could you please just drop it from this patch? _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel