diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-08-19 12:48:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-19 12:48:09 +0200 |
| commit | c8710ad38900153af7a3e6762e99c062cfa46443 (patch) | |
| tree | a0c0632274c4eb72f51e99a5861f71cffe65ea60 /arch/mn10300/include/asm/highmem.h | |
| parent | perf, tracing: add missing __percpu markups (diff) | |
| parent | tracing: Clean up seqfile code for format file (diff) | |
| download | linux-dev-c8710ad38900153af7a3e6762e99c062cfa46443.tar.xz linux-dev-c8710ad38900153af7a3e6762e99c062cfa46443.zip | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'arch/mn10300/include/asm/highmem.h')
| -rw-r--r-- | arch/mn10300/include/asm/highmem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/include/asm/highmem.h b/arch/mn10300/include/asm/highmem.h index 90f2abb04bfd..b0b187a29b88 100644 --- a/arch/mn10300/include/asm/highmem.h +++ b/arch/mn10300/include/asm/highmem.h @@ -91,7 +91,7 @@ static inline unsigned long kmap_atomic(struct page *page, enum km_type type) return vaddr; } -static inline void kunmap_atomic(unsigned long vaddr, enum km_type type) +static inline void kunmap_atomic_notypecheck(unsigned long vaddr, enum km_type type) { #if HIGHMEM_DEBUG enum fixed_addresses idx = type + KM_TYPE_NR * smp_processor_id(); |