Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b24fd48a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents 0a305d2e 34f521fd

arch/arm/kernel/calls.S

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ __syscall_start: 
		.long	sys_wait4

/* 115 */	.long	sys_swapoff

		.long	sys_sysinfo

		.long	sys_ipc

		.long	sys_ipc_wrapper

		.long	sys_fsync

		.long	sys_sigreturn_wrapper

/* 120 */	.long	sys_clone_wrapper

arch/arm/kernel/entry-common.S

+4 −0
Original line number Diff line number Diff line
@@ -273,6 +273,10 @@ sys_mbind_wrapper: 
		str	r5, [sp, #4]

		b	sys_mbind



sys_ipc_wrapper:

		str	r5, [sp, #4]		@ push sixth arg

		b	sys_ipc



/*

 * Note: off_4k (r5) is always units of 4K.  If we can't do the requested

 * offset, we return EINVAL.