diff options
author | James Morris <jmorris@macbook.(none)> | 2009-12-03 07:33:40 +0100 |
---|---|---|
committer | James Morris <jmorris@macbook.(none)> | 2009-12-03 07:33:40 +0100 |
commit | c84d6efd363a3948eb32ec40d46bab6338580454 (patch) | |
tree | 3ba7ac46e6626fe8ac843834588609eb6ccee5c6 /arch/arm/mm/highmem.c | |
parent | TOMOYO: Add recursive directory matching operator support. (diff) | |
parent | Linux 2.6.32 (diff) | |
download | linux-c84d6efd363a3948eb32ec40d46bab6338580454.tar.xz linux-c84d6efd363a3948eb32ec40d46bab6338580454.zip |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/mm/highmem.c')
-rw-r--r-- | arch/arm/mm/highmem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c index 73cae57fa707..30f82fb5918c 100644 --- a/arch/arm/mm/highmem.c +++ b/arch/arm/mm/highmem.c @@ -46,6 +46,8 @@ void *kmap_atomic(struct page *page, enum km_type type) if (!PageHighMem(page)) return page_address(page); + debug_kmap_atomic(type); + kmap = kmap_high_get(page); if (kmap) return kmap; |