mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-19 09:04:57 +00:00
65fddcfca8
The replacement of <asm/pgrable.h> with <linux/pgtable.h> made the include
of the latter in the middle of asm includes. Fix this up with the aid of
the below script and manual adjustments here and there.
import sys
import re
if len(sys.argv) is not 3:
print "USAGE: %s <file> <header>" % (sys.argv[0])
sys.exit(1)
hdr_to_move="#include <linux/%s>" % sys.argv[2]
moved = False
in_hdrs = False
with open(sys.argv[1], "r") as f:
lines = f.readlines()
for _line in lines:
line = _line.rstrip('
')
if line == hdr_to_move:
continue
if line.startswith("#include <linux/"):
in_hdrs = True
elif not moved and in_hdrs:
moved = True
print hdr_to_move
print line
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Cain <bcain@codeaurora.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Nick Hu <nickhu@andestech.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vincent Chen <deanbo422@gmail.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: http://lkml.kernel.org/r/20200514170327.31389-4-rppt@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
65 lines
1.4 KiB
C
65 lines
1.4 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* ioremap implementation.
|
|
*
|
|
* Copyright (C) 2015 Cadence Design Systems Inc.
|
|
*/
|
|
|
|
#include <linux/io.h>
|
|
#include <linux/vmalloc.h>
|
|
#include <linux/pgtable.h>
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/io.h>
|
|
|
|
static void __iomem *xtensa_ioremap(unsigned long paddr, unsigned long size,
|
|
pgprot_t prot)
|
|
{
|
|
unsigned long offset = paddr & ~PAGE_MASK;
|
|
unsigned long pfn = __phys_to_pfn(paddr);
|
|
struct vm_struct *area;
|
|
unsigned long vaddr;
|
|
int err;
|
|
|
|
paddr &= PAGE_MASK;
|
|
|
|
WARN_ON(pfn_valid(pfn));
|
|
|
|
size = PAGE_ALIGN(offset + size);
|
|
|
|
area = get_vm_area(size, VM_IOREMAP);
|
|
if (!area)
|
|
return NULL;
|
|
|
|
vaddr = (unsigned long)area->addr;
|
|
area->phys_addr = paddr;
|
|
|
|
err = ioremap_page_range(vaddr, vaddr + size, paddr, prot);
|
|
|
|
if (err) {
|
|
vunmap((void *)vaddr);
|
|
return NULL;
|
|
}
|
|
|
|
flush_cache_vmap(vaddr, vaddr + size);
|
|
return (void __iomem *)(offset + vaddr);
|
|
}
|
|
|
|
void __iomem *xtensa_ioremap_nocache(unsigned long addr, unsigned long size)
|
|
{
|
|
return xtensa_ioremap(addr, size, pgprot_noncached(PAGE_KERNEL));
|
|
}
|
|
EXPORT_SYMBOL(xtensa_ioremap_nocache);
|
|
|
|
void __iomem *xtensa_ioremap_cache(unsigned long addr, unsigned long size)
|
|
{
|
|
return xtensa_ioremap(addr, size, PAGE_KERNEL);
|
|
}
|
|
EXPORT_SYMBOL(xtensa_ioremap_cache);
|
|
|
|
void xtensa_iounmap(volatile void __iomem *io_addr)
|
|
{
|
|
void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr);
|
|
|
|
vunmap(addr);
|
|
}
|
|
EXPORT_SYMBOL(xtensa_iounmap);
|