diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 11:43:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 11:43:06 +0200 |
| commit | 5373fdbdc1dba69aa956098650f71b731d471885 (patch) | |
| tree | 8d9f07539896a696352818820c9c5f6612370882 /arch/x86/mm/ioremap.c | |
| parent | bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f (diff) | |
| parent | 4d51c7587bb13dbb2fafcad6c0b5231bd864b55f (diff) | |
| download | kernel_samsung_smdk4412-5373fdbdc1dba69aa956098650f71b731d471885.zip kernel_samsung_smdk4412-5373fdbdc1dba69aa956098650f71b731d471885.tar.gz kernel_samsung_smdk4412-5373fdbdc1dba69aa956098650f71b731d471885.tar.bz2 | |
Merge branch 'tracing/mmiotrace' into auto-ftrace-next
Diffstat (limited to 'arch/x86/mm/ioremap.c')
| -rw-r--r-- | arch/x86/mm/ioremap.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 2b2bb3f..e92aa46 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -12,6 +12,7 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/vmalloc.h> +#include <linux/mmiotrace.h> #include <asm/cacheflush.h> #include <asm/e820.h> @@ -122,10 +123,13 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, { unsigned long pfn, offset, vaddr; resource_size_t last_addr; + const resource_size_t unaligned_phys_addr = phys_addr; + const unsigned long unaligned_size = size; struct vm_struct *area; unsigned long new_prot_val; pgprot_t prot; int retval; + void __iomem *ret_addr; /* Don't allow wraparound or zero size */ last_addr = phys_addr + size - 1; @@ -233,7 +237,10 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, return NULL; } - return (void __iomem *) (vaddr + offset); + ret_addr = (void __iomem *) (vaddr + offset); + mmiotrace_ioremap(unaligned_phys_addr, unaligned_size, ret_addr); + + return ret_addr; } /** @@ -325,6 +332,8 @@ void iounmap(volatile void __iomem *addr) addr = (volatile void __iomem *) (PAGE_MASK & (unsigned long __force)addr); + mmiotrace_iounmap(addr); + /* Use the vm area unlocked, assuming the caller ensures there isn't another iounmap for the same address in parallel. Reuse of the virtual address is prevented by |