Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp553464ybk; Fri, 15 May 2020 07:39:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFLfNzzgAsiJMB8fieWWmSTeEh+PbZ917i/DLQRdn2RJaSrW62+LSRRtrd+5JpSkP7U7Am X-Received: by 2002:a50:c3c2:: with SMTP id i2mr3308742edf.227.1589553571252; Fri, 15 May 2020 07:39:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589553571; cv=none; d=google.com; s=arc-20160816; b=HgbgGYXrEeH7V9MKpdsnCOeM9a9XNbQgkFOsnsyKL2027bYeS8eFnXLbtmQK+9NNXW 4SeWfqO8QMbh3ohBXefpkjM9FQdoNEUkb6jIzorHhrD3Zfbex3FGDUorkgu4nxxhwbQV wuB0xORMG1wO+rOIjM1dCQf3clnh1Y6L0/qQn+/xXlcAcVO+agaQgsyQNOBOSXHxXUmc 4Kv+Duj41TmKbJKi5EiGZf6vLdzJBp7+gWi/T4V9kGFbuBlYaQw74jWZitwC4bUJhdm1 sV5E4bSTMrERpt33ooKvqeBNmHrgR7XBCpDR0sO3mEdRtxR213opSrMHtLWNITAyAqsL bBZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TnbCkkwCrUJoVyKDF526uiErLGT3jwDipU5D/anO8xc=; b=fpRyC6AfF8lv9hyvsjCa1xMsQU8/wNF1sVGEmJi4M3ANARgJCyxCnqgUm/EAw6Ml0E HMCSOV0JOFAZN7sjGlRsFpw6AzS+ExD24dSu9JwFZ6WctD7F5tPjdqG09WasIsKWplvN nRCaUw8PnLlU4UlWuk3Xtz9FL4HlpuO732aJhwVR2qIy2J46FORly4yRAsgHpKD69V7z 3y7FBhcsoo8n7C456wg5Hx+hQORKGgsBnMVzPqIQWfhitDdNyAbqsHE0Jbo1m6sMexOs 9ba2Q9dDZtFhZ1YcnOJ6eRPUf9SXjiAbzG8dvRqVIo2yJ6k0eOwDDvK8d8CZHXW58gPr Rrkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b="Yg/1sGMN"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 13si1247512ejz.499.2020.05.15.07.39.07; Fri, 15 May 2020 07:39:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b="Yg/1sGMN"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726663AbgEOOhb (ORCPT + 99 others); Fri, 15 May 2020 10:37:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726302AbgEOOh0 (ORCPT ); Fri, 15 May 2020 10:37:26 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32E94C061A0C; Fri, 15 May 2020 07:37:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=TnbCkkwCrUJoVyKDF526uiErLGT3jwDipU5D/anO8xc=; b=Yg/1sGMNgegwbtPN8e3l3mjuT5 IG+U9qiqX2BpWZW5HdvwsSQA60De/nQt3TpJXPQRKQ7EPXuSZnetBVwuqRDjvblJFfZGHQFJgAnXm HexvWXx282zsGkHTgK8V+Kd436i+xu/35S62Ifj7kzJOc63js73HolOH2dm+6DNkeK8wmsVd/pHiv pI6ZzdcQKdTw7Q4ycGaIyCQnPUoHk667HjzWtokNqIMMIU2kUM76aQFAk9Q75/oTkTrIldGqYPJbA 8wZis1cE5a+R1kI7WETW1Wx9A0zLLClKWp+6llj5sI6qEEPPSQR2DPvTvgNP/olc941lb5Mlc9TaE L8gNcDBA==; Received: from [2001:4bb8:188:1506:c70:4a89:bc61:2] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jZbSQ-0003wV-8r; Fri, 15 May 2020 14:37:02 +0000 From: Christoph Hellwig To: Andrew Morton , Arnd Bergmann , Roman Zippel Cc: Jessica Yu , Michal Simek , x86@kernel.org, linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, openrisc@lists.librecores.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-um@lists.infradead.org, linux-xtensa@linux-xtensa.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 05/29] asm-generic: fix the inclusion guards for cacheflush.h Date: Fri, 15 May 2020 16:36:22 +0200 Message-Id: <20200515143646.3857579-6-hch@lst.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200515143646.3857579-1-hch@lst.de> References: <20200515143646.3857579-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org cacheflush.h uses a somewhat to generic include guard name that clashes with various arch files. Use a more specific one. Signed-off-by: Christoph Hellwig --- include/asm-generic/cacheflush.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/asm-generic/cacheflush.h b/include/asm-generic/cacheflush.h index cac7404b2bdd2..906277492ec59 100644 --- a/include/asm-generic/cacheflush.h +++ b/include/asm-generic/cacheflush.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_CACHEFLUSH_H -#define __ASM_CACHEFLUSH_H +#ifndef _ASM_GENERIC_CACHEFLUSH_H +#define _ASM_GENERIC_CACHEFLUSH_H /* Keep includes the same across arches. */ #include @@ -109,4 +109,4 @@ static inline void flush_cache_vunmap(unsigned long start, unsigned long end) memcpy(dst, src, len) #endif -#endif /* __ASM_CACHEFLUSH_H */ +#endif /* _ASM_GENERIC_CACHEFLUSH_H */ -- 2.26.2