2 files changed, 3 insertions, 2 deletions

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 024888bb9814..48a976c52cf5 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -1265,7 +1265,8 @@ static ssize_t cpuset_common_file_write(struct cgroup *cont,
                 return -E2BIG;
 
         /* +1 for nul-terminator */
-        if ((buffer = kmalloc(nbytes + 1, GFP_KERNEL)) == 0)
+        buffer = kmalloc(nbytes + 1, GFP_KERNEL);
+        if (!buffer)
                 return -ENOMEM;
 
         if (copy_from_user(buffer, userbuf, nbytes)) {
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 6d792b66d854..5ca37fa50beb 100644
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -92,7 +92,7 @@ static struct pid_namespace *create_pid_namespace(int level)
         atomic_set(&ns->pidmap[0].nr_free, BITS_PER_PAGE - 1);
 
         for (i = 1; i < PIDMAP_ENTRIES; i++) {
-                ns->pidmap[i].page = 0;
+                ns->pidmap[i].page = NULL;
                 atomic_set(&ns->pidmap[i].nr_free, BITS_PER_PAGE);
         }