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

diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S
index 37e9acc9e58740d5307cee3dcba670bdabc77f42..98d24bc0004441ea0e57f3ef4cc5feb003d0dff7 100644 (file)
--- 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 0ccd8f983b50b732497c96006f889caf73c1dabd..8138d9eb58ec1c7e64b801fdbb47edb97e21df3d 100644 (file)
--- 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:
  */