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

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

Merge branch 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 

* 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (44 commits)
  [CVE-2009-0029] s390 specific system call wrappers
  [CVE-2009-0029] System call wrappers part 33
  [CVE-2009-0029] System call wrappers part 32
  [CVE-2009-0029] System call wrappers part 31
  [CVE-2009-0029] System call wrappers part 30
  [CVE-2009-0029] System call wrappers part 29
  [CVE-2009-0029] System call wrappers part 28
  [CVE-2009-0029] System call wrappers part 27
  [CVE-2009-0029] System call wrappers part 26
  [CVE-2009-0029] System call wrappers part 25
  [CVE-2009-0029] System call wrappers part 24
  [CVE-2009-0029] System call wrappers part 23
  [CVE-2009-0029] System call wrappers part 22
  [CVE-2009-0029] System call wrappers part 21
  [CVE-2009-0029] System call wrappers part 20
  [CVE-2009-0029] System call wrappers part 19
  [CVE-2009-0029] System call wrappers part 18
  [CVE-2009-0029] System call wrappers part 17
  [CVE-2009-0029] System call wrappers part 16
  [CVE-2009-0029] System call wrappers part 15
  ...
parents 74d96f01 26689452

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ config HAVE_EFFICIENT_UNALIGNED_ACCESS 
	  See Documentation/unaligned-memory-access.txt for more

	  information on the topic of unaligned memory accesses.



config HAVE_SYSCALL_WRAPPERS

	bool



config KRETPROBES

	def_bool y

	depends on KPROBES && HAVE_KRETPROBES

arch/alpha/kernel/entry.S

+4 −4
Original line number Diff line number Diff line
@@ -896,9 +896,9 @@ sys_getxpid: 
.end sys_getxpid



	.align	4

	.globl	sys_pipe

	.ent	sys_pipe

sys_pipe:

	.globl	sys_alpha_pipe

	.ent	sys_alpha_pipe

sys_alpha_pipe:

	lda	$sp, -16($sp)

	stq	$26, 0($sp)

	.prologue 0
@@ -916,7 +916,7 @@ sys_pipe: 
	stq	$1, 80+16($sp)

1:	lda	$sp, 16($sp)

	ret

.end sys_pipe

.end sys_alpha_pipe



	.align	4

	.globl	sys_execve

arch/alpha/kernel/systbls.S

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ sys_call_table: 
	.quad sys_setpgid

	.quad alpha_ni_syscall			/* 40 */

	.quad sys_dup

	.quad sys_pipe

	.quad sys_alpha_pipe

	.quad osf_set_program_attributes

	.quad alpha_ni_syscall

	.quad sys_open				/* 45 */

arch/arm/kernel/calls.S

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 
		CALL(sys_uselib)

		CALL(sys_swapon)

		CALL(sys_reboot)

		CALL(OBSOLETE(old_readdir))	/* used by libc4 */

		CALL(OBSOLETE(sys_old_readdir))	/* used by libc4 */

/* 90 */	CALL(OBSOLETE(old_mmap))	/* used by libc4 */

		CALL(sys_munmap)

		CALL(sys_truncate)

arch/cris/arch-v10/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ sys_call_table: 
	.long sys_uselib

	.long sys_swapon

	.long sys_reboot

	.long old_readdir

	.long sys_old_readdir

	.long old_mmap		/* 90 */

	.long sys_munmap

	.long sys_truncate