From patchwork Mon Sep 27 21:02:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12520779 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4168C433F5 for ; Mon, 27 Sep 2021 21:05:37 +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 7334E60240 for ; Mon, 27 Sep 2021 21:05:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7334E60240 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IR9Qdq4dwgGcEKI/uUsTm1kqTjqYDA0cTy3+LsVo2cc=; b=lAUh9+jW+6Yg40 C574vOxKiK7Nst1+NXSd1IsNQW0m4toaMB6NURKffmPbP8mmYjFTjSKf1X2sakzdBRpLit4GSrwH0 VA752pouOQWleJQj37rIUn3xuIyNVlynUH9HBRNF0JyvAAE5XbvShMHbxYFRC/iRGkRwj8IDT5Nhg GnwMlPtxGEnbBJfHpNnHuk7hs1WBG/vnaJJy7QeBgKgnibfKPuhAxVn/9rJn8A45kTsJR0dZHyBhj K2QtTSGLyvk9GFUp0wvP8t1h2R4w00fYdjV3mUmwIsZo3S9TkzUf4qRQr5Bc8b/1l+MVDsM7fiTNy r0Ep6TFxgDV6tNTsFSoA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUxmB-004IE5-2T; Mon, 27 Sep 2021 21:03:03 +0000 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUxm4-004IB9-3t for linux-arm-kernel@lists.infradead.org; Mon, 27 Sep 2021 21:02:57 +0000 Received: by mail-pf1-x42a.google.com with SMTP id g14so17079681pfm.1 for ; Mon, 27 Sep 2021 14:02:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RE9qlrpj4A/Ec+OQwHI70Yn7GuZgbAKhGWX1AXM0xpo=; b=YGIjvwZhzsw6kAJhvVIiI9MDxv37kl5ErlyrkQ13GaONqGwh0yiCHq//mbwy4GPRLy KCcGzVRCCGg+qqu2o8ruWMmo4dt/GrlIN6bVL0Dg1a6G4YCLKXxoaAR3Hp5+194OAfNh 7XQkPXin7pQ6XCeZicyfwIZlRpa95H8QpepQ/2csWhlVJbr5Ngr256VALL3Zdnp+hHqk rTJs5J7NmOzLeEjpLciBGdv+QqfaZvnDzr+/URMqkQPuBnSd/hVr+ADaHOXnk5gHW+0S r6WjVZo6nVQuvWhny9qCd36xHhin3o6JhATvEEsMoiTmoIIW9phihEomQJy1N87iUYxN hjFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RE9qlrpj4A/Ec+OQwHI70Yn7GuZgbAKhGWX1AXM0xpo=; b=4hHrZhTpg16i6rIPjZgnyXO5yb9Ee4xYl15myNkFZYul/L/In1pupbMIoa+G9KHI/8 CVOkFyslfbv8OZyBZuUdWvNF83hpOtqTkagBECjzEriJKMVtNaQAWX+SLZXQ+pbSXwx+ q7Np5Ek6KNNpPo9kIwGtLWbeY+aXCOGs8LxFIkiE4wnLn0iIDr1mcrqJf8ZGvgKn4SXg d59ej0CnMIe49oj+439nhAgmAp8GTbcDzEm6Ow2jLlOOJPraVgFbtf4BFii+9t3UdAl1 iqvu5t7e1QUiKvaON5iNAW+WyulNi2LNkwVJXAy/a2u/rp0gmHaTgDFQEZ8UNrjZ0sBK ZKWg== X-Gm-Message-State: AOAM532zkf4UFqNOAddwy9yfrfanWxw0Vo8A+BtFAlWGha/X8wr7wDjo 9SOCZXAfa+mT0BaweIq8mx0= X-Google-Smtp-Source: ABdhPJx6hoxRVEppF7KGqLUzy5SoNLDY8id4zgbAM0Ptx1ftU6lMOOb3aXp9wu+6o8q6W/bHIaR68w== X-Received: by 2002:a05:6a00:8b:b0:44b:9710:52bd with SMTP id c11-20020a056a00008b00b0044b971052bdmr1912122pfj.76.1632776574995; Mon, 27 Sep 2021 14:02:54 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id y3sm310537pjg.7.2021.09.27.14.02.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 14:02:54 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Greg Kroah-Hartman , Sasha Levin , Alex Sverdlin , Russell King , Florian Fainelli , Steven Rostedt , Ingo Molnar , Russell King , linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT) Subject: [PATCH stable 4.19 v3 1/4] ARM: 9077/1: PLT: Move struct plt_entries definition to header Date: Mon, 27 Sep 2021 14:02:43 -0700 Message-Id: <20210927210246.3216892-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927210246.3216892-1-f.fainelli@gmail.com> References: <20210927210246.3216892-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210927_140256_190186_6FFBE5F0 X-CRM114-Status: GOOD ( 13.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Alex Sverdlin commit 4e271701c17dee70c6e1351c4d7d42e70405c6a9 upstream No functional change, later it will be re-used in several files. Signed-off-by: Alexander Sverdlin Signed-off-by: Russell King Signed-off-by: Florian Fainelli --- arch/arm/include/asm/module.h | 9 +++++++++ arch/arm/kernel/module-plts.c | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h index 9e81b7c498d8..56d4c97e578a 100644 --- a/arch/arm/include/asm/module.h +++ b/arch/arm/include/asm/module.h @@ -19,6 +19,15 @@ enum { }; #endif +#define PLT_ENT_STRIDE L1_CACHE_BYTES +#define PLT_ENT_COUNT (PLT_ENT_STRIDE / sizeof(u32)) +#define PLT_ENT_SIZE (sizeof(struct plt_entries) / PLT_ENT_COUNT) + +struct plt_entries { + u32 ldr[PLT_ENT_COUNT]; + u32 lit[PLT_ENT_COUNT]; +}; + struct mod_plt_sec { struct elf32_shdr *plt; int plt_count; diff --git a/arch/arm/kernel/module-plts.c b/arch/arm/kernel/module-plts.c index 3d0c2e4dda1d..f272711c411f 100644 --- a/arch/arm/kernel/module-plts.c +++ b/arch/arm/kernel/module-plts.c @@ -14,10 +14,6 @@ #include #include -#define PLT_ENT_STRIDE L1_CACHE_BYTES -#define PLT_ENT_COUNT (PLT_ENT_STRIDE / sizeof(u32)) -#define PLT_ENT_SIZE (sizeof(struct plt_entries) / PLT_ENT_COUNT) - #ifdef CONFIG_THUMB2_KERNEL #define PLT_ENT_LDR __opcode_to_mem_thumb32(0xf8dff000 | \ (PLT_ENT_STRIDE - 4)) @@ -26,11 +22,6 @@ (PLT_ENT_STRIDE - 8)) #endif -struct plt_entries { - u32 ldr[PLT_ENT_COUNT]; - u32 lit[PLT_ENT_COUNT]; -}; - static bool in_init(const struct module *mod, unsigned long loc) { return loc - (u32)mod->init_layout.base < mod->init_layout.size;