From patchwork Thu Mar 2 00:15:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9599345 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3305D604A8 for ; Thu, 2 Mar 2017 00:25:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23F7428565 for ; Thu, 2 Mar 2017 00:25:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 170C528576; Thu, 2 Mar 2017 00:25:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6F37828565 for ; Thu, 2 Mar 2017 00:25:15 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=TzAad2SQcH8eEDO7Ps2C1ksVtEoPDF2DsMt0UjMkJvo=; b=KhEo9lyFbtRykL11jiK4XLR2XM 0BBL3BxU1jRNIQpmZUOcot3HN/c91AOkgi6tKpnE47V2ykMoGwh1bbUwjoXlDAdFlo0+qsBlAVeC2 U4c7dMQrbjH24GQ6DKmyW+bIp24ks0DahXbPJOeZFWvj1tamDT/XmxNN6eIXVKFcw/Vvsqn1Auamk KYC40gcl67u8HWwiQUxkwR4hieLkz9s6WqLLY/DfCszhnl9TxyL3w+Mlq2tFpFusfeC2j3y+D+lr0 Pgiw3uOF4sXyGjgYbgqC4qFOTBur8ETsQoOhYXPlh9F+RL3EQVKpr60WWTqf76O56v++itJtS9dXH RAgW7x5w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cjEYU-0001Fv-0p; Thu, 02 Mar 2017 00:25:14 +0000 Received: from mail-qk0-f180.google.com ([209.85.220.180]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cjEQ5-0001OG-Ve for linux-arm-kernel@lists.infradead.org; Thu, 02 Mar 2017 00:16:49 +0000 Received: by mail-qk0-f180.google.com with SMTP id n127so98954525qkf.0 for ; Wed, 01 Mar 2017 16:16:16 -0800 (PST) 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:in-reply-to :references; bh=hprQQUOft41fQtZcGFea04Ujp124lIezouM5YbeM/hU=; b=g0nR68fCVZfIJszd33L1iGuskjIZYI+ZlgRvwjdX0E8ttfCRBe22FgvPYLRvMX05W+ 5RdMrGDDJ6d9LOspVrXZjf1e5pK7/3eayBfAfL4jCx6AGKqZOBd5yK7MiVlQu/3EwOZf FhWUlVL6NLq2v5rLYetbSZrugyWX+ZgaMBKDGmO9gR9W0aFZKnUSQJ2w8xvFgc2CZ3PT jo01R+NIQ1+hE4aqQIMb5kC2GbNJyR0FNN4kmxF6NtGRzvagFYTQFx65q47B8j2urp+S DjvHzjBmTmra8wjW3nH/VyH6RVcaxm+AhCjTydNY3TyukUhbuMUHAFxZPSWG+IC621JR 12vw== X-Gm-Message-State: AMke39l6u3lZov3DXtTlCeoPTjRko2oDrYOUH4YHUIKjJ420oSd4Gw4EIBRw3PMgeVdKIjy8 X-Received: by 10.237.35.231 with SMTP id k36mr14244762qtc.192.1488413775355; Wed, 01 Mar 2017 16:16:15 -0800 (PST) Received: from labbott-redhat-machine.redhat.com ([2601:602:9802:a8dc::5ce7]) by smtp.gmail.com with ESMTPSA id i125sm4234601qkf.52.2017.03.01.16.16.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Mar 2017 16:16:13 -0800 (PST) From: Laura Abbott To: Russell King , Catalin Marinas , Will Deacon , Martin Schwidefsky , Heiko Carstens , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Kees Cook , Mark Rutland , Arnd Bergmann , David Airlie , Alexander Shishkin , Wim Van Sebroeck , Guenter Roeck , linux-watchdog@vger.kernel.org, "David S. Miller" , Daniel Borkmann , Jessica Yu , Takashi Iwai , Andrew Morton Subject: [PATCHv2 14/14] treewide: Decouple cacheflush.h and set_memory.h Date: Wed, 1 Mar 2017 16:15:06 -0800 Message-Id: <1488413706-9739-15-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488413706-9739-1-git-send-email-labbott@redhat.com> References: <1488413706-9739-1-git-send-email-labbott@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170301_161634_325283_1B595504 X-CRM114-Status: GOOD ( 14.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, linux-s390@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, Laura Abbott , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Now that all call sites, completely decouple cacheflush.h and set_memory.h Signed-off-by: Laura Abbott Acked-by: Russell King Acked-by: Mark Rutland Acked-by: Catalin Marinas --- arch/arm/include/asm/cacheflush.h | 1 - arch/arm64/include/asm/cacheflush.h | 1 - arch/s390/include/asm/Kbuild | 1 + arch/s390/include/asm/cacheflush.h | 8 -------- arch/x86/include/asm/cacheflush.h | 1 - 5 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 arch/s390/include/asm/cacheflush.h diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index 1cb9d11..d69bebf 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -16,7 +16,6 @@ #include #include #include -#include #define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT) diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h index 7db6962..5812469 100644 --- a/arch/arm64/include/asm/cacheflush.h +++ b/arch/arm64/include/asm/cacheflush.h @@ -20,7 +20,6 @@ #define __ASM_CACHEFLUSH_H #include -#include /* * This flag is used to indicate that the page pointed to by a pte is clean diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild index 8aea32f..c0a7057 100644 --- a/arch/s390/include/asm/Kbuild +++ b/arch/s390/include/asm/Kbuild @@ -1,4 +1,5 @@ generic-y += asm-offsets.h +generic-y += cacheflush.h generic-y += clkdev.h generic-y += dma-contiguous.h generic-y += export.h diff --git a/arch/s390/include/asm/cacheflush.h b/arch/s390/include/asm/cacheflush.h deleted file mode 100644 index afe2965..0000000 --- a/arch/s390/include/asm/cacheflush.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _S390_CACHEFLUSH_H -#define _S390_CACHEFLUSH_H - -/* Caches aren't brain-dead on the s390. */ -#include -#include - -#endif /* _S390_CACHEFLUSH_H */ diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h index 3d7db6f..8b4140f 100644 --- a/arch/x86/include/asm/cacheflush.h +++ b/arch/x86/include/asm/cacheflush.h @@ -4,7 +4,6 @@ /* Caches aren't brain-dead on the intel. */ #include #include -#include void clflush_cache_range(void *addr, unsigned int size);