diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:28:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:28:53 -0800 |
| commit | dd49f96777d5a72d5591ac2112d4ac940391774e (patch) | |
| tree | 6d9c8bdcd21c600ce1a1c8ea8acb9aec15f6ca4a | |
| parent | a62e68488dd5ddb07776555fd7e0435c6d021ac1 (diff) | |
| parent | 8b4ad5e3ff94409973e824716c65568f0d97364c (diff) | |
| download | blackbird-op-linux-dd49f96777d5a72d5591ac2112d4ac940391774e.tar.gz blackbird-op-linux-dd49f96777d5a72d5591ac2112d4ac940391774e.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
| -rw-r--r-- | arch/sparc64/kernel/systbls.S | 2 | ||||
| -rw-r--r-- | include/linux/mutex-debug.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S index 37e9acc9e587..98d24bc00044 100644 --- a/arch/sparc64/kernel/systbls.S +++ b/arch/sparc64/kernel/systbls.S @@ -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 diff --git a/include/linux/mutex-debug.h b/include/linux/mutex-debug.h index 0ccd8f983b50..8138d9eb58ec 100644 --- a/include/linux/mutex-debug.h +++ b/include/linux/mutex-debug.h @@ -1,6 +1,8 @@ #ifndef __LINUX_MUTEX_DEBUG_H #define __LINUX_MUTEX_DEBUG_H +#include <linux/linkage.h> + /* * Mutexes - debugging helpers: */ |
