Commit 01b0c014 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3ebb0540 e527b22c

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -6789,6 +6789,14 @@ W: http://www.mellanox.com 
Q:	http://patchwork.ozlabs.org/project/netdev/list/

F:	drivers/net/ethernet/mellanox/mlxsw/



MEMBARRIER SUPPORT

M:	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

M:	"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>

L:	linux-kernel@vger.kernel.org

S:	Supported

F:	kernel/membarrier.c

F:	include/uapi/linux/membarrier.h



MEMORY MANAGEMENT

L:	linux-mm@kvack.org

W:	http://www.linux-mm.org

arch/x86/entry/syscalls/syscall_32.tbl

+1 −0
Original line number Diff line number Diff line
@@ -381,3 +381,4 @@ 
372	i386	recvmsg			sys_recvmsg			compat_sys_recvmsg

373	i386	shutdown		sys_shutdown

374	i386	userfaultfd		sys_userfaultfd

375	i386	membarrier		sys_membarrier

arch/x86/entry/syscalls/syscall_64.tbl

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ 
321	common	bpf			sys_bpf

322	64	execveat		stub_execveat

323	common	userfaultfd		sys_userfaultfd

324	common	membarrier		sys_membarrier



#

# x32-specific system call numbers start at 512 to avoid cache impact

drivers/iommu/omap-iommu-debug.c

+2 −1
Original line number Diff line number Diff line
@@ -135,8 +135,9 @@ __dump_tlb_entries(struct omap_iommu *obj, struct cr_regs *crs, int num) 
static ssize_t iotlb_dump_cr(struct omap_iommu *obj, struct cr_regs *cr,

			     struct seq_file *s)

{

	return seq_printf(s, "%08x %08x %01x\n", cr->cam, cr->ram,

	seq_printf(s, "%08x %08x %01x\n", cr->cam, cr->ram,

			  (cr->cam & MMU_CAM_P) ? 1 : 0);

	return 0;

}



static size_t omap_dump_tlb_entries(struct omap_iommu *obj, struct seq_file *s)

fs/nsfs.c

+2 −1
Original line number Diff line number Diff line
@@ -142,7 +142,8 @@ static int nsfs_show_path(struct seq_file *seq, struct dentry *dentry) 
	struct inode *inode = d_inode(dentry);

	const struct proc_ns_operations *ns_ops = dentry->d_fsdata;



	return seq_printf(seq, "%s:[%lu]", ns_ops->name, inode->i_ino);

	seq_printf(seq, "%s:[%lu]", ns_ops->name, inode->i_ino);

	return 0;

}



static const struct super_operations nsfs_ops = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE