History

Merge tag 'xtensa-next-20141215' of git://github.com/czankel/xtensa-linux

Pull Xtensa fixes from Chris Zankel: - fix nommu support - remove s6000 variant and s6105 platform - 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 - disable linker optimizations because of a linker bug - fix sparse error * tag 'xtensa-next-20141215' of git://github.com/czankel/xtensa-linux: xtensa: disable link optimization xtensa/uaccess: fix sparse errors xtensa: fix kmap_prot definition xtensa: add power management menu to Kconfig xtensa: remove s6000 variant and s6105 platform xtensa: make PLATFORM_DEFAULT_MEM parameters configurable xtensa: nommu: clean up memory map dump xtensa: nommu: reserve memory below PLATFORM_DEFAULT_MEM_START xtensa: nommu: set up cache and atomctl in initialize_mmu xtensa: move vecbase SR initialization to _startup xtensa: nommu: fix uImage load address xtensa: nommu: fix load address definitions xtensa: nommu: fix Image.elf reset code and ld script xtensa: nommu: add MMU dependency to DEBUG_TLB_SANITY xtensa: nommu: don't build most of the cache flushing code xtensa: nommu: don't provide arch_get_unmapped_area xtensa: nommu: provide MAP_UNINITIALIZED definition xtensa: nommu: provide _PAGE_CHG_MASK definition xtensa: nommu: provide __invalidate_dcache_page_alias stub xtensa: nommu: move init_mmu stub to nommu_context.h

Linus Torvalds committed 11 years ago

Commit a643fc72 parents 0db2812 1f2fdbd41 files · +149 −3042Browse files

Showing the changes to arch/xtensa/include/uapi (1 of 41 files). Show all

Unified · Split

arch/xtensa/include/uapi/asm/mman.h+6−0
@@ -55,6 +55,12 @@ · 54 unmodified lines
5555 #define MAP_NONBLOCK 0x20000 /* do not block on IO */
5656 #define MAP_STACK 0x40000 /* give out an address that is best suited for process/thread stacks */
5757 #define MAP_HUGETLB 0x80000 /* create a huge page mapping */
58+#ifdef CONFIG_MMAP_ALLOW_UNINITIALIZED
59+# define MAP_UNINITIALIZED 0x4000000 /* For anonymous mmap, memory could be
60+ * uninitialized */
61+#else
62+# define MAP_UNINITIALIZED 0x0 /* Don't support this flag */
63+#endif
5864
5965 /*
6066 * Flags for msync