projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
xtensa
/
mm
/
highmem.c
diff --git
a/arch/xtensa/mm/highmem.c
b/arch/xtensa/mm/highmem.c
index 8cfb71ec0937369a8adf79a3d6e754f589cbba5f..184ceadccc1a3aca946b3c9e609a2efb91046807 100644
(file)
--- a/
arch/xtensa/mm/highmem.c
+++ b/
arch/xtensa/mm/highmem.c
@@
-42,6
+42,7
@@
void *kmap_atomic(struct page *page)
enum fixed_addresses idx;
unsigned long vaddr;
+ preempt_disable();
pagefault_disable();
if (!PageHighMem(page))
return page_address(page);
@@
-79,6
+80,7
@@
void __kunmap_atomic(void *kvaddr)
}
pagefault_enable();
+ preempt_enable();
}
EXPORT_SYMBOL(__kunmap_atomic);