From e00d8b2f447c02951306e3a474fc56c43e67f093 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Wed, 29 Oct 2014 01:42:01 +0300 Subject: xtensa: add power management menu to Kconfig This allows using runtime power management feature on Xtensa. Signed-off-by: Max Filippov --- arch/xtensa/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 81f57e8c8f1b..697fb28104ca 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -414,6 +414,12 @@ source "fs/Kconfig.binfmt" endmenu +menu "Power management options" + +source "kernel/power/Kconfig" + +endmenu + source "net/Kconfig" source "drivers/Kconfig" -- cgit v1.2.3 From ff009ab6d4d4581b62fa055ab6233133aca25ab8 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Tue, 9 Dec 2014 03:04:24 +0300 Subject: xtensa: fix kmap_prot definition Replace PAGE_KERNEL with PAGE_KERNEL_EXEC to allow copy_to_user_page invalidate icache for pages mapped with kmap. Cc: stable@vger.kernel.org Signed-off-by: Max Filippov --- arch/xtensa/include/asm/highmem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3