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.

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.
Chris Zankel
2 parents 865566ed33 ff009ab6d4
Showing 2 changed files Side-by-side Diff
arch/xtensa/Kconfig
arch/xtensa/include/asm/highmem.h
@@ -436,6 +436,12 @@
  
 endmenu
  
+menu "Power management options"
+
+source "kernel/power/Kconfig"
+
+endmenu
+
 source "net/Kconfig"
  
 source "drivers/Kconfig"
@@ -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
...	...	@@ -436,6 +436,12 @@
436	436
437	437	endmenu
438	438
	439	+menu "Power management options"
	440	+
	441	+source "kernel/power/Kconfig"
	442	+
	443	+endmenu
	444	+
439	445	source "net/Kconfig"
440	446
441	447	source "drivers/Kconfig"
...	...	@@ -25,7 +25,7 @@
25	25	#define PKMAP_NR(virt) (((virt) - PKMAP_BASE) >> PAGE_SHIFT)
26	26	#define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT))
27	27
28		-#define kmap_prot PAGE_KERNEL
	28	+#define kmap_prot PAGE_KERNEL_EXEC
29	29
30	30	#if DCACHE_WAY_SIZE > PAGE_SIZE
31	31	#define get_pkmap_color get_pkmap_color