History

Merge branch 'akpm' (patches from Andrew)

Merge third patch-bomb from Andrew Morton: - even more of the rest of MM - lib/ updates - checkpatch updates - small changes to a few scruffy filesystems - kmod fixes/cleanups - kexec updates - a dma-mapping cleanup series from hch * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (81 commits) dma-mapping: consolidate dma_set_mask dma-mapping: consolidate dma_supported dma-mapping: cosolidate dma_mapping_error dma-mapping: consolidate dma_{alloc,free}_noncoherent dma-mapping: consolidate dma_{alloc,free}_{attrs,coherent} mm: use vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd() mm: make sure all file VMAs have ->vm_ops set mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff() mm: mark most vm_operations_struct const namei: fix warning while make xmldocs caused by namei.c ipc: convert invalid scenarios to use WARN_ON zlib_deflate/deftree: remove bi_reverse() lib/decompress_unlzma: Do a NULL check for pointer lib/decompressors: use real out buf size for gunzip with kernel fs/affs: make root lookup from blkdev logical size sysctl: fix int -> unsigned long assignments in INT_MIN case kexec: export KERNEL_IMAGE_SIZE to vmcoreinfo kexec: align crash_notes allocation to make it be inside one physical page kexec: remove unnecessary test in kimage_alloc_crash_control_pages() kexec: split kexec_load syscall from kexec core code ...

Linus Torvalds committed 11 years ago

Commit 33e247c2 parents d71fc23 452e06a165 files · +4886 −4471Browse files

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

Unified · Split

include/uapi/linux/kernel-page-flags.h+1−0
@@ -33,6 +33,7 @@ · 32 unmodified lines
3333 #define KPF_THP 22
3434 #define KPF_BALLOON 23
3535 #define KPF_ZERO_PAGE 24
36+#define KPF_IDLE 25
3637
3738
3839 #endif /* _UAPILINUX_KERNEL_PAGE_FLAGS_H */