Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756147AbdCGU5x (ORCPT ); Tue, 7 Mar 2017 15:57:53 -0500 Received: from mail-qk0-f181.google.com ([209.85.220.181]:32975 "EHLO mail-qk0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755194AbdCGU5q (ORCPT ); Tue, 7 Mar 2017 15:57:46 -0500 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 Cc: Laura Abbott , x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCHv3 16/16] treewide: Decouple cacheflush.h and set_memory.h Date: Tue, 7 Mar 2017 12:55:33 -0800 Message-Id: <1488920133-27229-17-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488920133-27229-1-git-send-email-labbott@redhat.com> References: <1488920133-27229-1-git-send-email-labbott@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2509 Lines: 80 Now that all call sites, completely decouple cacheflush.h and set_memory.h Acked-by: Catalin Marinas Acked-by: Mark Rutland Signed-off-by: Laura Abbott --- v3: No changes --- 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); -- 2.7.4