5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
138 lines
3.2 KiB
C
138 lines
3.2 KiB
C
/*
|
|
* arch/sh/mm/ioremap.c
|
|
*
|
|
* (C) Copyright 1995 1996 Linus Torvalds
|
|
* (C) Copyright 2005 - 2010 Paul Mundt
|
|
*
|
|
* Re-map IO memory to kernel address space so that we can access it.
|
|
* This is needed for high PCI addresses that aren't mapped in the
|
|
* 640k-1MB IO memory area on PC's
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General
|
|
* Public License. See the file "COPYING" in the main directory of this
|
|
* archive for more details.
|
|
*/
|
|
#include <linux/vmalloc.h>
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/io.h>
|
|
#include <asm/page.h>
|
|
#include <asm/pgalloc.h>
|
|
#include <asm/addrspace.h>
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/tlbflush.h>
|
|
#include <asm/mmu.h>
|
|
|
|
/*
|
|
* Remap an arbitrary physical address space into the kernel virtual
|
|
* address space. Needed when the kernel wants to access high addresses
|
|
* directly.
|
|
*
|
|
* NOTE! We need to allow non-page-aligned mappings too: we will obviously
|
|
* have to convert them into an offset in a page-aligned mapping, but the
|
|
* caller shouldn't need to know that small detail.
|
|
*/
|
|
void __iomem * __init_refok
|
|
__ioremap_caller(phys_addr_t phys_addr, unsigned long size,
|
|
pgprot_t pgprot, void *caller)
|
|
{
|
|
struct vm_struct *area;
|
|
unsigned long offset, last_addr, addr, orig_addr;
|
|
void __iomem *mapped;
|
|
|
|
/* Don't allow wraparound or zero size */
|
|
last_addr = phys_addr + size - 1;
|
|
if (!size || last_addr < phys_addr)
|
|
return NULL;
|
|
|
|
/*
|
|
* If we can't yet use the regular approach, go the fixmap route.
|
|
*/
|
|
if (!mem_init_done)
|
|
return ioremap_fixed(phys_addr, size, pgprot);
|
|
|
|
/*
|
|
* First try to remap through the PMB.
|
|
* PMB entries are all pre-faulted.
|
|
*/
|
|
mapped = pmb_remap_caller(phys_addr, size, pgprot, caller);
|
|
if (mapped && !IS_ERR(mapped))
|
|
return mapped;
|
|
|
|
/*
|
|
* Mappings have to be page-aligned
|
|
*/
|
|
offset = phys_addr & ~PAGE_MASK;
|
|
phys_addr &= PAGE_MASK;
|
|
size = PAGE_ALIGN(last_addr+1) - phys_addr;
|
|
|
|
/*
|
|
* Ok, go for it..
|
|
*/
|
|
area = get_vm_area_caller(size, VM_IOREMAP, caller);
|
|
if (!area)
|
|
return NULL;
|
|
area->phys_addr = phys_addr;
|
|
orig_addr = addr = (unsigned long)area->addr;
|
|
|
|
if (ioremap_page_range(addr, addr + size, phys_addr, pgprot)) {
|
|
vunmap((void *)orig_addr);
|
|
return NULL;
|
|
}
|
|
|
|
return (void __iomem *)(offset + (char *)orig_addr);
|
|
}
|
|
EXPORT_SYMBOL(__ioremap_caller);
|
|
|
|
/*
|
|
* Simple checks for non-translatable mappings.
|
|
*/
|
|
static inline int iomapping_nontranslatable(unsigned long offset)
|
|
{
|
|
#ifdef CONFIG_29BIT
|
|
/*
|
|
* In 29-bit mode this includes the fixed P1/P2 areas, as well as
|
|
* parts of P3.
|
|
*/
|
|
if (PXSEG(offset) < P3SEG || offset >= P3_ADDR_MAX)
|
|
return 1;
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
|
|
void __iounmap(void __iomem *addr)
|
|
{
|
|
unsigned long vaddr = (unsigned long __force)addr;
|
|
struct vm_struct *p;
|
|
|
|
/*
|
|
* Nothing to do if there is no translatable mapping.
|
|
*/
|
|
if (iomapping_nontranslatable(vaddr))
|
|
return;
|
|
|
|
/*
|
|
* There's no VMA if it's from an early fixed mapping.
|
|
*/
|
|
if (iounmap_fixed(addr) == 0)
|
|
return;
|
|
|
|
/*
|
|
* If the PMB handled it, there's nothing else to do.
|
|
*/
|
|
if (pmb_unmap(addr) == 0)
|
|
return;
|
|
|
|
p = remove_vm_area((void *)(vaddr & PAGE_MASK));
|
|
if (!p) {
|
|
printk(KERN_ERR "%s: bad address %p\n", __func__, addr);
|
|
return;
|
|
}
|
|
|
|
kfree(p);
|
|
}
|
|
EXPORT_SYMBOL(__iounmap);
|