From patchwork Tue Sep 10 13:51:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 1160370 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sipsolutions.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pfpn1EmU"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46SRKJ26wSz9sPD for ; Tue, 10 Sep 2019 23:51:48 +1000 (AEST) 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:MIME-Version:References:In-Reply-To: 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: List-Owner; bh=mNbuJWxfjshuKkbFcXiqNr87GUwCvvwRu+QArsWLj7E=; b=pfpn1EmUpsSjtU sUeHNU3wUyBgzyGkbqRnkKUu5YZQUIvbZe3X4x0Ta2UU0WZ+TZLqcjRH1aHiyPXX53V2fzkRXgIRr z0HjFh4rUvfWChgbLxeN1DmCVGmugisTtokXM35Hu6gp6v3O6wWa1gFoXai9ok70jKHVwEPe+Kiz7 FMgpy4hzlkLSo7HbccfGT3GSmix2HWZXhZgZNo5Wza0P+jcEhO+976U2wpuOUblQeoxZ99rN7swxQ 5eubF9xEou2FsEJZElllOeaKFOOL/OBk6uKGAABruIUzdSUiLaH7ylE0s+/VQfh4q/zfyrYbbixgT OZQd26W7wZ98AKz3VbvQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i7gYS-000131-Nj; Tue, 10 Sep 2019 13:51:36 +0000 Received: from s3.sipsolutions.net ([2a01:4f8:191:4433::2] helo=sipsolutions.net) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i7gYQ-00011D-Hc for linux-um@lists.infradead.org; Tue, 10 Sep 2019 13:51:35 +0000 Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1i7gYP-0006jF-67; Tue, 10 Sep 2019 15:51:33 +0200 From: Johannes Berg To: linux-um@lists.infradead.org Subject: [PATCH v4 1/5] um: don't use generic barrier.h Date: Tue, 10 Sep 2019 15:51:25 +0200 Message-Id: <1568123461-I95235a4f9e6929241afd5150f1ceceb45f5e28af@changeid> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910135129.23095-1-johannes@sipsolutions.net> References: <20190910135129.23095-1-johannes@sipsolutions.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190910_065134_577980_7FD946F4 X-CRM114-Status: UNSURE ( 8.22 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.4 KHOP_HELO_FCRDNS Relay HELO differs from its IP's reverse DNS X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johannes Berg Sender: "linux-um" Errors-To: linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Johannes Berg UML has its own platform-specific barrier.h under arch/x86/um/, which should get used. Fix the build system to use it, and then fix the barrier.h to actually compile. Signed-off-by: Johannes Berg --- I'm debugging some odd stuff with virtio, and the next patch is to remove dma_rmb/dma_wmb from this, or at least make them conditional on virtio support, since if we have virtio support we really need memory barriers there, not just compiler barriers. . At least in theory. My problem isn't actually fixed by this. --- arch/um/include/asm/Kbuild | 1 - arch/x86/um/asm/barrier.h | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild index b352ed09260e..398006d27e40 100644 --- a/arch/um/include/asm/Kbuild +++ b/arch/um/include/asm/Kbuild @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -generic-y += barrier.h generic-y += bpf_perf_event.h generic-y += bug.h generic-y += compat.h diff --git a/arch/x86/um/asm/barrier.h b/arch/x86/um/asm/barrier.h index f31e5d903161..eb0654f39fd2 100644 --- a/arch/x86/um/asm/barrier.h +++ b/arch/x86/um/asm/barrier.h @@ -2,14 +2,7 @@ #ifndef _ASM_UM_BARRIER_H_ #define _ASM_UM_BARRIER_H_ -#include -#include -#include -#include -#include - -#include -#include +#include /* * Force strict CPU ordering.