History

Merge branch 'akpm' (patches from Andrew)

Merge second patch-bomb from Andrew Morton: - more MM stuff: - Kirill's page-flags rework - Kirill's now-allegedly-fixed THP rework - MADV_FREE implementation - DAX feature work (msync/fsync). This isn't quite complete but DAX is new and it's good enough and the guys have a handle on what needs to be done - I expect this to be wrapped in the next week or two. - some vsprintf maintenance work - various other misc bits * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (145 commits) printk: change recursion_bug type to bool lib/vsprintf: factor out %pN[F] handler as netdev_bits() lib/vsprintf: refactor duplicate code to special_hex_number() printk-formats.txt: remove unimplemented %pT printk: help pr_debug and pr_devel to optimize out arguments lib/test_printf.c: test dentry printing lib/test_printf.c: add test for large bitmaps lib/test_printf.c: account for kvasprintf tests lib/test_printf.c: add a few number() tests lib/test_printf.c: test precision quirks lib/test_printf.c: check for out-of-bound writes lib/test_printf.c: don't BUG lib/kasprintf.c: add sanity check to kvasprintf lib/vsprintf.c: warn about too large precisions and field widths lib/vsprintf.c: help gcc make number() smaller lib/vsprintf.c: expand field_width to 24 bits lib/vsprintf.c: eliminate potential race in string() lib/vsprintf.c: move string() below widen_string() lib/vsprintf.c: pull out padding code from dentry_name() printk: do cond_resched() between lines while outputting to consoles ...

Linus Torvalds committed 10 years ago

Commit 0cbeafb2 parents 58cf279 06b031d189 files · +4429 −2958Browse files

Showing the changes to include/uapi (1 of 189 files). Show all

Unified · Split

include/uapi/asm-generic/mman-common.h+1−0
@@ -41,6 +41,7 @@ · 40 unmodified lines
4141 #define MADV_DONTNEED 4 /* don't need these pages */
4242
4343 /* common parameters: try to keep these consistent across architectures */
44+#define MADV_FREE 8 /* free pages only if memory pressure */
4445 #define MADV_REMOVE 9 /* remove these pages & resources */
4546 #define MADV_DONTFORK 10 /* don't inherit across fork */
4647 #define MADV_DOFORK 11 /* do inherit across fork */