From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Hogan Subject: [PATCH] asm-generic/io.h: remove asm/cacheflush.h include Date: Tue, 23 Oct 2012 10:21:57 +0100 Message-ID: <1350984117-17369-1-git-send-email-james.hogan@imgtec.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-bounces@lists.openrisc.net Errors-To: linux-bounces@lists.openrisc.net To: Arnd Bergmann , Jonas Bonn Cc: linux-arch@vger.kernel.org, linux-xtensa@linux-xtensa.org, James Hogan , Mike Frysinger , Chris Zankel , linux-kernel@vger.kernel.org, Max Filippov , linux@lists.openrisc.net, Guan Xuetao , uclinux-dist-devel@blackfin.uclinux.org, Chen Liqin , Lennox Wu List-Id: linux-arch.vger.kernel.org Including from prevents cacheflush.h being able to use I/O functions like readl and writel due to circular include dependencies. It doesn't appear as if anything from cacheflush.h is actually used by the generic io.h, so remove the include. I've compile tested a defconfig compilation of blackfin, openrisc (which needed including from it's to get the PAGE_* definitions), and xtensa. Other architectures which use asm-generic/io.h are score and unicore32, and looking at their io.h I don't see any obvious problems. Signed-off-by: James Hogan Cc: Arnd Bergmann Cc: Jonas Bonn Cc: Chris Zankel Cc: Max Filippov Cc: Mike Frysinger Cc: Chen Liqin Cc: Lennox Wu Cc: Guan Xuetao --- Any compile testing of score and unicore32 anybody could provide would be great. arch/openrisc/include/asm/io.h | 1 + include/asm-generic/io.h | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/openrisc/include/asm/io.h b/arch/openrisc/include/asm/io.h index 07f5299..7c69139 100644 --- a/arch/openrisc/include/asm/io.h +++ b/arch/openrisc/include/asm/io.h @@ -30,6 +30,7 @@ #define PIO_MASK 0 #include +#include extern void __iomem *__ioremap(phys_addr_t offset, unsigned long size, pgprot_t prot); diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 448303b..616eea5 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -12,7 +12,6 @@ #define __ASM_GENERIC_IO_H #include /* I/O is all done through memory accesses */ -#include #include #ifdef CONFIG_GENERIC_IOMAP -- 1.7.7.6 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from multi.imgtec.com ([194.200.65.239]:11188 "EHLO multi.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932695Ab2JWJYI (ORCPT ); Tue, 23 Oct 2012 05:24:08 -0400 From: James Hogan Subject: [PATCH] asm-generic/io.h: remove asm/cacheflush.h include Date: Tue, 23 Oct 2012 10:21:57 +0100 Message-ID: <1350984117-17369-1-git-send-email-james.hogan@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-arch-owner@vger.kernel.org List-ID: To: Arnd Bergmann , Jonas Bonn Cc: linux-arch@vger.kernel.org, linux@lists.openrisc.net, linux-kernel@vger.kernel.org, uclinux-dist-devel@blackfin.uclinux.org, linux-xtensa@linux-xtensa.org, James Hogan , Chris Zankel , Max Filippov , Mike Frysinger , Chen Liqin , Lennox Wu , Guan Xuetao Message-ID: <20121023092157.5yKzC7wxkQ6buTCpBNnr2b8Tyyozjujz0JNmD5ANAJw@z> Including from prevents cacheflush.h being able to use I/O functions like readl and writel due to circular include dependencies. It doesn't appear as if anything from cacheflush.h is actually used by the generic io.h, so remove the include. I've compile tested a defconfig compilation of blackfin, openrisc (which needed including from it's to get the PAGE_* definitions), and xtensa. Other architectures which use asm-generic/io.h are score and unicore32, and looking at their io.h I don't see any obvious problems. Signed-off-by: James Hogan Cc: Arnd Bergmann Cc: Jonas Bonn Cc: Chris Zankel Cc: Max Filippov Cc: Mike Frysinger Cc: Chen Liqin Cc: Lennox Wu Cc: Guan Xuetao --- Any compile testing of score and unicore32 anybody could provide would be great. arch/openrisc/include/asm/io.h | 1 + include/asm-generic/io.h | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/openrisc/include/asm/io.h b/arch/openrisc/include/asm/io.h index 07f5299..7c69139 100644 --- a/arch/openrisc/include/asm/io.h +++ b/arch/openrisc/include/asm/io.h @@ -30,6 +30,7 @@ #define PIO_MASK 0 #include +#include extern void __iomem *__ioremap(phys_addr_t offset, unsigned long size, pgprot_t prot); diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 448303b..616eea5 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -12,7 +12,6 @@ #define __ASM_GENERIC_IO_H #include /* I/O is all done through memory accesses */ -#include #include #ifdef CONFIG_GENERIC_IOMAP -- 1.7.7.6