diff options
| author | Chris Zankel | 2014-12-16 05:10:39 +0100 |
|---|---|---|
| committer | Chris Zankel | 2014-12-16 05:10:39 +0100 |
| commit | 2cb54e8493615484fd3e29f1f51d96201706b419 (patch) | |
| tree | 00a5e7ce228628d5850a9de397eba8d2f2ade0b9 /arch/xtensa/include | |
| parent | Merge tag 'v3.18' into for_next (diff) | |
| parent | xtensa: fix kmap_prot definition (diff) | |
| download | kernel-qcow2-linux-2cb54e8493615484fd3e29f1f51d96201706b419.tar.gz kernel-qcow2-linux-2cb54e8493615484fd3e29f1f51d96201706b419.tar.xz kernel-qcow2-linux-2cb54e8493615484fd3e29f1f51d96201706b419.zip | |
Merge tag 'xtensa-for-next-20141213' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Xtensa improvements for 3.19:
- fix permissions for kmapped pages so that copy_to_user_page works with
them;
- add power management menu to Kconfig to allow use of runtime PM.
Diffstat (limited to 'arch/xtensa/include')
| -rw-r--r-- | arch/xtensa/include/asm/highmem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/highmem.h b/arch/xtensa/include/asm/highmem.h index 2c7901edffaf..01cef6b40829 100644 --- a/arch/xtensa/include/asm/highmem.h +++ b/arch/xtensa/include/asm/highmem.h @@ -25,7 +25,7 @@ #define PKMAP_NR(virt) (((virt) - PKMAP_BASE) >> PAGE_SHIFT) #define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT)) -#define kmap_prot PAGE_KERNEL +#define kmap_prot PAGE_KERNEL_EXEC #if DCACHE_WAY_SIZE > PAGE_SIZE #define get_pkmap_color get_pkmap_color |