From 057d0514b7b3523ea1ae45f5af8f8efa61422937 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Mar 2012 16:10:40 -0700
Subject: [PATCH] --- yaml --- r: 293925 b: refs/heads/master c:
 f7493e5d9cc10ac97cf1f1579fdc14117460b40b h: refs/heads/master i:   293923:
 2e3feb816186bfa9428c32173076b128a2576041 v: v3

---
 [refs]           | 2 +-
 trunk/fs/namei.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f93f8e806429..4f7ea8e06a5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 989412bbd2835f1475d1528846693eddbac744c8
+refs/heads/master: f7493e5d9cc10ac97cf1f1579fdc14117460b40b
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 99a34717b2b0..73ec863a9896 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -161,7 +161,7 @@ static char *getname_flags(const char __user *filename, int flags, int *empty)
 
 char *getname(const char __user * filename)
 {
-	return getname_flags(filename, 0, 0);
+	return getname_flags(filename, 0, NULL);
 }
 
 #ifdef CONFIG_AUDITSYSCALL
@@ -1408,7 +1408,7 @@ static inline int can_lookup(struct inode *inode)
  */
 static inline long count_masked_bytes(unsigned long mask)
 {
-	return mask*0x0001020304050608 >> 56;
+	return mask*0x0001020304050608ul >> 56;
 }
 
 static inline unsigned int fold_hash(unsigned long hash)
@@ -1972,7 +1972,7 @@ int user_path_at_empty(int dfd, const char __user *name, unsigned flags,
 int user_path_at(int dfd, const char __user *name, unsigned flags,
 		 struct path *path)
 {
-	return user_path_at_empty(dfd, name, flags, path, 0);
+	return user_path_at_empty(dfd, name, flags, path, NULL);
 }
 
 static int user_path_parent(int dfd, const char __user *path,