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,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 12BA3C10F27 for ; Tue, 10 Mar 2020 13:34:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA47B20675 for ; Tue, 10 Mar 2020 13:34:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583847270; bh=iX2h9xIM0kJfdo1vtwCYCI/uuVOptRR5Y8/LX5Tsfas=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=U93Nif/S8oIOUnuSWiEgH2bAyKy+0pmcsY/+sSJU0a39+8i6x4ahfJ6X+yhquLkGk S14e9lO0P75Cz1lj7JbRbs6jBkbvfLslUBaM4mQiogpet22X8ME4LuJHPSGDt80IOF b8n+1pGPc0lLuVCBLJ069SH+ZcM+C8r77nMeLY3M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728032AbgCJMqe (ORCPT ); Tue, 10 Mar 2020 08:46:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:49758 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726761AbgCJMq3 (ORCPT ); Tue, 10 Mar 2020 08:46:29 -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 8FD7324691; Tue, 10 Mar 2020 12:46:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583844389; bh=iX2h9xIM0kJfdo1vtwCYCI/uuVOptRR5Y8/LX5Tsfas=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oQbNqbXGy37wqauy8434gX2+FAQa5YdaLGnb5rZdQxjPn47Re7tsY8V/MuoyNK06v LKjTtd0IzX4PALNQ4XSeeGZwBokoGM/zfPRhbH8BDbkfDFwCm4eXt+wujpLY5qlfJu efLcLVGtIDl7M+NWOp6xBXH5c8Vrnr/tE/+ZQxYA= 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.9 62/88] x86/boot/compressed: Dont declare __force_order in kaslr_64.c Date: Tue, 10 Mar 2020 13:39:10 +0100 Message-Id: <20200310123621.868809541@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310123606.543939933@linuxfoundation.org> References: <20200310123606.543939933@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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/pagetable.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/x86/boot/compressed/pagetable.c b/arch/x86/boot/compressed/pagetable.c index 56589d0a804b1..2591f8f6d45f2 100644 --- a/arch/x86/boot/compressed/pagetable.c +++ b/arch/x86/boot/compressed/pagetable.c @@ -25,9 +25,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