cb84c2b401
hexagon:defconfig fails to build in linux-next since commit 332fd7c4fe
("genirq: Generic chip: Change irq_reg_{readl,writel} arguments").
The primary build failure is
arch/hexagon/include/asm/cacheflush.h: In function 'copy_to_user_page':
arch/hexagon/include/asm/cacheflush.h:89:22: error: 'VM_EXEC' undeclared
This is the result of including of <linux/io.h> from <linux/irq.h>,
which is now necessary due to the use of readl and writel from irq.h.
This causes recursive inclusions in hexagon code; cacheflush.h is included
from mm.h prior to the definition of VM_EXEC.
Fix the problem by moving copy_to_user_page from the hexagon include file to
arch/hexagon/mm/cache.c, similar to other architectures. After this change,
several redefinitions of readl and writel are reported. Those are caused
by recursive inclusions of io.h and asm/cacheflush.h. Fix those problems by
reducing the number of files included from those files. Also, it was necessary
to stop including asm-generic/cacheflush.h from asm/cacheflush.h. Instead,
functionality originally provided by asm-generic/cacheflush.h is now coded
in asm/cacheflush.h directly.
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
signed-off-by: Richard Kuo <rkuo@codeaurora.org>
58 lines
1.7 KiB
C
58 lines
1.7 KiB
C
/*
|
|
* I/O remap functions for Hexagon
|
|
*
|
|
* Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 and
|
|
* only version 2 as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
* 02110-1301, USA.
|
|
*/
|
|
|
|
#include <linux/io.h>
|
|
#include <linux/vmalloc.h>
|
|
#include <linux/mm.h>
|
|
|
|
void __iomem *ioremap_nocache(unsigned long phys_addr, unsigned long size)
|
|
{
|
|
unsigned long last_addr, addr;
|
|
unsigned long offset = phys_addr & ~PAGE_MASK;
|
|
struct vm_struct *area;
|
|
|
|
pgprot_t prot = __pgprot(_PAGE_PRESENT|_PAGE_READ|_PAGE_WRITE
|
|
|(__HEXAGON_C_DEV << 6));
|
|
|
|
last_addr = phys_addr + size - 1;
|
|
|
|
/* Wrapping not allowed */
|
|
if (!size || (last_addr < phys_addr))
|
|
return NULL;
|
|
|
|
/* Rounds up to next page size, including whole-page offset */
|
|
size = PAGE_ALIGN(offset + size);
|
|
|
|
area = get_vm_area(size, VM_IOREMAP);
|
|
addr = (unsigned long)area->addr;
|
|
|
|
if (ioremap_page_range(addr, addr+size, phys_addr, prot)) {
|
|
vunmap((void *)addr);
|
|
return NULL;
|
|
}
|
|
|
|
return (void __iomem *) (offset + addr);
|
|
}
|
|
|
|
void __iounmap(const volatile void __iomem *addr)
|
|
{
|
|
vunmap((void *) ((unsigned long) addr & PAGE_MASK));
|
|
}
|