Commit 2cb54e84 authored by Chris Zankel's avatar Chris Zankel
Browse files

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.
parents 865566ed ff009ab6

arch/xtensa/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -436,6 +436,12 @@ source "fs/Kconfig.binfmt" 


endmenu



menu "Power management options"



source "kernel/power/Kconfig"



endmenu



source "net/Kconfig"



source "drivers/Kconfig"

arch/xtensa/include/asm/highmem.h

+1 −1
Original line number Diff line number Diff line
@@ -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