Merge branch 'akpm' (patches from Andrew)
Merge fourth patch-bomb from Andrew Morton: - sys_membarier syscall - seq_file interface changes - a few misc fixups * emailed patches from Andrew Morton <akpm@linux-foundation.org>: revert "ocfs2/dlm: use list_for_each_entry instead of list_for_each" mm/early_ioremap: add explicit #include of asm/early_ioremap.h fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void selftests: enhance membarrier syscall test selftests: add membarrier syscall test sys_membarrier(): system-wide memory barrier (generic, x86) MODSIGN: fix a compilation warning in extract-cert
Showing
- MAINTAINERS 8 additions, 0 deletionsMAINTAINERS
- arch/x86/entry/syscalls/syscall_32.tbl 1 addition, 0 deletionsarch/x86/entry/syscalls/syscall_32.tbl
- arch/x86/entry/syscalls/syscall_64.tbl 1 addition, 0 deletionsarch/x86/entry/syscalls/syscall_64.tbl
- drivers/iommu/omap-iommu-debug.c 2 additions, 1 deletiondrivers/iommu/omap-iommu-debug.c
- fs/nsfs.c 2 additions, 1 deletionfs/nsfs.c
- fs/ocfs2/dlm/dlmrecovery.c 4 additions, 2 deletionsfs/ocfs2/dlm/dlmrecovery.c
- fs/seq_file.c 31 additions, 39 deletionsfs/seq_file.c
- include/linux/seq_file.h 10 additions, 9 deletionsinclude/linux/seq_file.h
- include/linux/syscalls.h 2 additions, 0 deletionsinclude/linux/syscalls.h
- include/uapi/asm-generic/unistd.h 3 additions, 1 deletioninclude/uapi/asm-generic/unistd.h
- include/uapi/linux/Kbuild 1 addition, 0 deletionsinclude/uapi/linux/Kbuild
- include/uapi/linux/membarrier.h 53 additions, 0 deletionsinclude/uapi/linux/membarrier.h
- init/Kconfig 12 additions, 0 deletionsinit/Kconfig
- kernel/Makefile 1 addition, 0 deletionskernel/Makefile
- kernel/membarrier.c 66 additions, 0 deletionskernel/membarrier.c
- kernel/sys_ni.c 3 additions, 0 deletionskernel/sys_ni.c
- mm/early_ioremap.c 1 addition, 0 deletionsmm/early_ioremap.c
- scripts/extract-cert.c 1 addition, 1 deletionscripts/extract-cert.c
- tools/testing/selftests/Makefile 1 addition, 0 deletionstools/testing/selftests/Makefile
- tools/testing/selftests/membarrier/.gitignore 1 addition, 0 deletionstools/testing/selftests/membarrier/.gitignore
Loading
Please register or sign in to comment