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=-9.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,USER_AGENT_GIT 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 38C0CC10F27 for ; Tue, 10 Mar 2020 13:16:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 125CE222D9 for ; Tue, 10 Mar 2020 13:16:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583846166; bh=EpB+hNHyM4aBcJsJprlm1tfQc8ejGExjREpw2qKL+j4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OBd6Iii9akdWooZtkV9+tFf/CU0mNOjxC8b41RALaPl12Q5GICBIs0usCVdXJj99Y rqQMDFwJhK/be4OC8qUFaJgBKQdTqZzuZbuVVDo7TNCfyAKuuW3dpgxbeiEHo73J8I tfnziA4O5rutZ+A3PKQ9PZg0LZ27p+4ufpHeJZDM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731786AbgCJNN4 (ORCPT ); Tue, 10 Mar 2020 09:13:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:37136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731119AbgCJNN4 (ORCPT ); Tue, 10 Mar 2020 09:13:56 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8AACC20409; Tue, 10 Mar 2020 13:13:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583846035; bh=EpB+hNHyM4aBcJsJprlm1tfQc8ejGExjREpw2qKL+j4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NxakJw3zlF92wyxCZxybkR3yYYGzrEC4lAa/0Y6Jaza07kPSwSgcyQxw4TIZ9GRk1 3y5hP+gRGox5T2KDEiMIWoy/ndhDkMwkjHsfmg0cG6LpkzSRl8TCkDibw0v38+tvZq zAYlc/FuxMLnFQlMAKnbApaj0jo7Xyh3h4nIbSQ8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "H.J. Lu" , Borislav Petkov , Sasha Levin Subject: [PATCH 4.19 26/86] x86/boot/compressed: Dont declare __force_order in kaslr_64.c Date: Tue, 10 Mar 2020 13:44:50 +0100 Message-Id: <20200310124532.195024429@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310124530.808338541@linuxfoundation.org> References: <20200310124530.808338541@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: H.J. Lu [ Upstream commit df6d4f9db79c1a5d6f48b59db35ccd1e9ff9adfc ] GCC 10 changed the default to -fno-common, which leads to LD arch/x86/boot/compressed/vmlinux ld: arch/x86/boot/compressed/pgtable_64.o:(.bss+0x0): multiple definition of `__force_order'; \ arch/x86/boot/compressed/kaslr_64.o:(.bss+0x0): first defined here make[2]: *** [arch/x86/boot/compressed/Makefile:119: arch/x86/boot/compressed/vmlinux] Error 1 Since __force_order is already provided in pgtable_64.c, there is no need to declare __force_order in kaslr_64.c. Signed-off-by: H.J. Lu Signed-off-by: Borislav Petkov Link: https://lkml.kernel.org/r/20200124181811.4780-1-hjl.tools@gmail.com Signed-off-by: Sasha Levin --- arch/x86/boot/compressed/kaslr_64.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/x86/boot/compressed/kaslr_64.c b/arch/x86/boot/compressed/kaslr_64.c index 748456c365f46..9557c5a15b91e 100644 --- a/arch/x86/boot/compressed/kaslr_64.c +++ b/arch/x86/boot/compressed/kaslr_64.c @@ -29,9 +29,6 @@ #define __PAGE_OFFSET __PAGE_OFFSET_BASE #include "../../mm/ident_map.c" -/* Used by pgtable.h asm code to force instruction serialization. */ -unsigned long __force_order; - /* Used to track our page table allocation area. */ struct alloc_pgt_data { unsigned char *pgt_buf; -- 2.20.1