9b04ebd158
Including <asm/cacheflush.h> from <asm-generic/io.h> 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 <asm/pgtable.h> including from it's <asm/io.h> 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 <james.hogan@imgtec.com> Acked-by: Jonas Bonn <jonas@southpole.se> Cc: Chris Zankel <chris@zankel.net> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Chen Liqin <liqin.chen@sunplusct.com> Cc: Lennox Wu <lennox.wu@gmail.com> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
53 lines
1.3 KiB
C
53 lines
1.3 KiB
C
/*
|
|
* OpenRISC Linux
|
|
*
|
|
* Linux architectural port borrowing liberally from similar works of
|
|
* others. All original copyrights apply as per the original source
|
|
* declaration.
|
|
*
|
|
* OpenRISC implementation:
|
|
* Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se>
|
|
* et al.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#ifndef __ASM_OPENRISC_IO_H
|
|
#define __ASM_OPENRISC_IO_H
|
|
|
|
/*
|
|
* PCI: can we really do 0 here if we have no port IO?
|
|
*/
|
|
#define IO_SPACE_LIMIT 0
|
|
|
|
/* OpenRISC has no port IO */
|
|
#define HAVE_ARCH_PIO_SIZE 1
|
|
#define PIO_RESERVED 0X0UL
|
|
#define PIO_OFFSET 0
|
|
#define PIO_MASK 0
|
|
|
|
#include <asm-generic/io.h>
|
|
#include <asm/pgtable.h>
|
|
|
|
extern void __iomem *__ioremap(phys_addr_t offset, unsigned long size,
|
|
pgprot_t prot);
|
|
|
|
static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size)
|
|
{
|
|
return __ioremap(offset, size, PAGE_KERNEL);
|
|
}
|
|
|
|
/* #define _PAGE_CI 0x002 */
|
|
static inline void __iomem *ioremap_nocache(phys_addr_t offset,
|
|
unsigned long size)
|
|
{
|
|
return __ioremap(offset, size,
|
|
__pgprot(pgprot_val(PAGE_KERNEL) | _PAGE_CI));
|
|
}
|
|
|
|
extern void iounmap(void *addr);
|
|
#endif
|