diff options
| author | Chris Zankel <chris@zankel.net> | 2014-12-15 20:10:39 -0800 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-12-15 20:10:39 -0800 |
| commit | 2cb54e8493615484fd3e29f1f51d96201706b419 (patch) | |
| tree | 00a5e7ce228628d5850a9de397eba8d2f2ade0b9 /arch | |
| parent | 865566ed33f08637c3486b4d301e96a9064ad2eb (diff) | |
| parent | ff009ab6d4d4581b62fa055ab6233133aca25ab8 (diff) | |
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')
| -rw-r--r-- | arch/xtensa/Kconfig | 6 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/highmem.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 8cdbc4cc830c..e31d4949124a 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -436,6 +436,12 @@ source "fs/Kconfig.binfmt" endmenu +menu "Power management options" + +source "kernel/power/Kconfig" + +endmenu + source "net/Kconfig" source "drivers/Kconfig" 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 |