[XFS] Fix merge failures

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/xfs/linux-2.6/xfs_cred.h
	fs/xfs/linux-2.6/xfs_globals.h
	fs/xfs/linux-2.6/xfs_ioctl.c
	fs/xfs/xfs_vnodeops.h

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/timer.c b/kernel/timer.c
index dbd50fabe4c7..566257d1dc10 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1192,25 +1192,25 @@ asmlinkage long sys_getppid(void)
 asmlinkage long sys_getuid(void)
 {
         /* Only we change this so SMP safe */
-        return current->uid;
+        return current_uid();
 }
 
 asmlinkage long sys_geteuid(void)
 {
         /* Only we change this so SMP safe */
-        return current->euid;
+        return current_euid();
 }
 
 asmlinkage long sys_getgid(void)
 {
         /* Only we change this so SMP safe */
-        return current->gid;
+        return current_gid();
 }
 
 asmlinkage long sys_getegid(void)
 {
         /* Only we change this so SMP safe */
-        return  current->egid;
+        return  current_egid();
 }
 
 #endif