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

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

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

parents a62e6848 8b4ad5e3

arch/sparc64/kernel/systbls.S

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ sys_call_table: 
	.word sys_umount, sys_setgid, sys_getgid, sys_signal, sys_geteuid

/*50*/	.word sys_getegid, sys_acct, sys_memory_ordering, sys_nis_syscall, sys_ioctl

	.word sys_reboot, sys_nis_syscall, sys_symlink, sys_readlink, sys_execve

/*60*/	.word sys_umask, sys_chroot, sys_newfstat, sys_stat64, sys_getpagesize

/*60*/	.word sys_umask, sys_chroot, sys_newfstat, sys_fstat64, sys_getpagesize

	.word sys_msync, sys_vfork, sys_pread64, sys_pwrite64, sys_nis_syscall

/*70*/	.word sys_nis_syscall, sys_mmap, sys_nis_syscall, sys64_munmap, sys_mprotect

	.word sys_madvise, sys_vhangup, sys_nis_syscall, sys_mincore, sys_getgroups

include/linux/mutex-debug.h

+2 −0
Original line number Diff line number Diff line 
#ifndef __LINUX_MUTEX_DEBUG_H

#define __LINUX_MUTEX_DEBUG_H



#include <linux/linkage.h>



/*

 * Mutexes - debugging helpers:

 */