git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
sparc
/
mm
/
highmem.c
diff --git
a/arch/sparc/mm/highmem.c
b/arch/sparc/mm/highmem.c
index
5e50c09
..
4730eac
100644
(file)
--- a/
arch/sparc/mm/highmem.c
+++ b/
arch/sparc/mm/highmem.c
@@
-75,7
+75,7
@@
void __kunmap_atomic(void *kvaddr)
return;
}
- type = kmap_atomic_idx
_pop
();
+ type = kmap_atomic_idx();
#ifdef CONFIG_DEBUG_HIGHMEM
{
@@
-104,6
+104,8
@@
void __kunmap_atomic(void *kvaddr)
#endif
}
#endif
+
+ kmap_atomic_idx_pop();
pagefault_enable();
}
EXPORT_SYMBOL(__kunmap_atomic);