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 branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.kernel...
[pandora-kernel.git]
/
arch
/
frv
/
mm
/
highmem.c
diff --git
a/arch/frv/mm/highmem.c
b/arch/frv/mm/highmem.c
index
61088dc
..
fd7fcd4
100644
(file)
--- a/
arch/frv/mm/highmem.c
+++ b/
arch/frv/mm/highmem.c
@@
-68,7
+68,7
@@
EXPORT_SYMBOL(__kmap_atomic);
void __kunmap_atomic(void *kvaddr)
{
void __kunmap_atomic(void *kvaddr)
{
- int type = kmap_atomic_idx
_pop
();
+ int type = kmap_atomic_idx();
switch (type) {
case 0: __kunmap_atomic_primary(4, 6); break;
case 1: __kunmap_atomic_primary(5, 7); break;
switch (type) {
case 0: __kunmap_atomic_primary(4, 6); break;
case 1: __kunmap_atomic_primary(5, 7); break;
@@
-83,6
+83,7
@@
void __kunmap_atomic(void *kvaddr)
default:
BUG();
}
default:
BUG();
}
+ kmap_atomic_idx_pop();
pagefault_enable();
}
EXPORT_SYMBOL(__kunmap_atomic);
pagefault_enable();
}
EXPORT_SYMBOL(__kunmap_atomic);