From patchwork Fri Oct 30 18:18:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11870523 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=-12.8 required=3.0 tests=BAYES_00,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, USER_AGENT_GIT 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 35236C00A89 for ; Fri, 30 Oct 2020 18:19:09 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 9823620729 for ; Fri, 30 Oct 2020 18:19:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="WGrl1nfl"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="dTIDxPGP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9823620729 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+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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=4cYeQ9khxet6EO0pBfqOSGXgGCiaVORdVQ6L0yEEs5w=; b=WGrl1nfl8jeWF437oamD23/y9C ciYm0rlnCUQnoKh/DYh/acgYAW/8as7XRagNxA1kFjv2c+rvresBxDRTRIM5Q1deOBI2aG0yJEM2C zFEXH5P1uHhrfUViOnDRkHozJOzo+5infedAFSOqKaxe8fgYjRu+t+PIKXQVSDRK4oX5gtfXvdfTT cRZGue+l1B1vEnX5xf8cluZ8cPhjv9bhyOhOi8e2tYHMTviSeoMAK79illhUXlzvTRd9cQgsIohVD sQ52exc+uU5UZnnZirdLfVErHknUYYvqBLSFSi2wvwrKCqqgdHKt5KnLF+VHPK2QtEKPmjyN6pMiS B4USUNTw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYYz4-0000id-29; Fri, 30 Oct 2020 18:18:42 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYYyy-0000go-GG for linux-arm-kernel@lists.infradead.org; Fri, 30 Oct 2020 18:18:37 +0000 Received: by mail-wr1-x441.google.com with SMTP id b3so1569491wrx.11 for ; Fri, 30 Oct 2020 11:18:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=POr4JSNxo9Vex3KFhgjAL6YPhe46OQ89C08+ir6XPTs=; b=dTIDxPGPYckzrbOC6452Z1q6L3MaW1Z9CfWUkssYbkTuuKzC890B9DQnGXkQ7eYX4z u1en4kP44xS3sM/Sgpw6aBzPfKh4+PI/qo9M4VNRqIY1ByMdgt7DuqqF4VXyqEkLLyfF z/OlkU05m48R64suFmuHzsonZet4HZnEru7tKDc4g858Tiq/hW2+1Fzp8jNtMePX23Ki /w42o716i+5AxhmT5iFTFAo+uxQ2sYqjeYRU8rMYdXhAOtNfPmOik3Qc+Om9sR+Vf1op ySXnMFI1sW67thE7M1Q4bUoemFEL/KIT/fgNKzdMso1GUM7oddT9hVN602WGpg1RbCyu d2CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=POr4JSNxo9Vex3KFhgjAL6YPhe46OQ89C08+ir6XPTs=; b=cniq2oqprSOCH/ESBCcQt9cpEgdt1NSozOCEG5frpC1nLRfKpvyvJOerWzrwfr36uE 8ggeA9R6aIYWQHVSqeejTS7QTAeULACDPGMX3PP9f6VT0mdiVQ/nr/wu8fYPkO6Gt8fE H9LpZnQFLXStO1HYtqFI6Vh+xmZrLa6rMJly/P8CAjgGTvxHbKbDvKuc5c/xrdY0hnoR hqfC4dEEc3MXU9I0i9fd0tTF1lJMqWt3gwLjjz0mbmUVqL8j88xZrQgZISb8t9KZALW5 aHv2aAS49i0FvBVgQB7n+o78mPYb16GNZpFvj0dYlDeKMFl6Fa56oZuCXh19tIY5KIyR MtIA== X-Gm-Message-State: AOAM531dM2MEPy57F3CLYWhr+81YiO38eUoSleOfaqamICpc/uppdmtP LwMPnEbfWxH26pqNhxxqRrTy9D4xQRRMMA== X-Google-Smtp-Source: ABdhPJxonhFew2B7p2VHkxM2LDKbQTJFr887Y1UWz9SfxnrnktBXTh6CZjDeCt19buh2y+hpgrAsxw== X-Received: by 2002:adf:b7c8:: with SMTP id t8mr4941556wre.143.1604081913792; Fri, 30 Oct 2020 11:18:33 -0700 (PDT) Received: from dell.default ([91.110.221.176]) by smtp.gmail.com with ESMTPSA id q6sm5666782wma.0.2020.10.30.11.18.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2020 11:18:32 -0700 (PDT) From: Lee Jones To: daniel.vetter@ffwll.ch, gregkh@linuxfoundation.org, yepeilin.cs@gmail.com Subject: [PATCH 1/1] Fonts: font_acorn_8x8: Replace discarded const qualifier Date: Fri, 30 Oct 2020 18:18:22 +0000 Message-Id: <20201030181822.570402-1-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201030_141836_584871_A478EC20 X-CRM114-Status: GOOD ( 15.84 ) 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: stable@vger.kernel.org, Lee Jones , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Russell King Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 09e5b3fd5672 ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts") introduced the following error when building rpc_defconfig (only this build appears to be affected): `acorndata_8x8' referenced in section `.text' of arch/arm/boot/compressed/ll_char_wr.o: defined in discarded section `.data' of arch/arm/boot/compressed/font.o `acorndata_8x8' referenced in section `.data.rel.ro' of arch/arm/boot/compressed/font.o: defined in discarded section `.data' of arch/arm/boot/compressed/font.o make[3]: *** [/scratch/linux/arch/arm/boot/compressed/Makefile:191: arch/arm/boot/compressed/vmlinux] Error 1 make[2]: *** [/scratch/linux/arch/arm/boot/Makefile:61: arch/arm/boot/compressed/vmlinux] Error 2 make[1]: *** [/scratch/linux/arch/arm/Makefile:317: zImage] Error 2 The .data section is discarded at link time. Reinstating acorndata_8x8 as const ensures it is still available after linking. Cc: Cc: Russell King Signed-off-by: Lee Jones Tested-by: Peilin Ye --- lib/fonts/font_acorn_8x8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fonts/font_acorn_8x8.c b/lib/fonts/font_acorn_8x8.c index 069b3e80c4344..fb395f0d40317 100644 --- a/lib/fonts/font_acorn_8x8.c +++ b/lib/fonts/font_acorn_8x8.c @@ -5,7 +5,7 @@ #define FONTDATAMAX 2048 -static struct font_data acorndata_8x8 = { +static const struct font_data acorndata_8x8 = { { 0, 0, FONTDATAMAX, 0 }, { /* 00 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ^@ */ /* 01 */ 0x7e, 0x81, 0xa5, 0x81, 0xbd, 0x99, 0x81, 0x7e, /* ^A */