diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/cgroup.c | 4 | ||||
-rw-r--r-- | kernel/futex.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index e9c2fb01e89b..53d86b4b0ce0 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -2082,7 +2082,7 @@ static int cgroup_tasks_open(struct inode *unused, struct file *file) | |||
2082 | 2082 | ||
2083 | kfree(pidarray); | 2083 | kfree(pidarray); |
2084 | } else { | 2084 | } else { |
2085 | ctr->buf = 0; | 2085 | ctr->buf = NULL; |
2086 | ctr->bufsz = 0; | 2086 | ctr->bufsz = 0; |
2087 | } | 2087 | } |
2088 | file->private_data = ctr; | 2088 | file->private_data = ctr; |
@@ -2614,7 +2614,7 @@ static int proc_cgroupstats_show(struct seq_file *m, void *v) | |||
2614 | 2614 | ||
2615 | static int cgroupstats_open(struct inode *inode, struct file *file) | 2615 | static int cgroupstats_open(struct inode *inode, struct file *file) |
2616 | { | 2616 | { |
2617 | return single_open(file, proc_cgroupstats_show, 0); | 2617 | return single_open(file, proc_cgroupstats_show, NULL); |
2618 | } | 2618 | } |
2619 | 2619 | ||
2620 | static struct file_operations proc_cgroupstats_operations = { | 2620 | static struct file_operations proc_cgroupstats_operations = { |
diff --git a/kernel/futex.c b/kernel/futex.c index 87a6428cb5b6..e43945e995f5 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -281,7 +281,7 @@ static int get_futex_key(u32 __user *uaddr, struct rw_semaphore *fshared, | |||
281 | */ | 281 | */ |
282 | static void get_futex_key_refs(union futex_key *key) | 282 | static void get_futex_key_refs(union futex_key *key) |
283 | { | 283 | { |
284 | if (key->both.ptr == 0) | 284 | if (key->both.ptr == NULL) |
285 | return; | 285 | return; |
286 | switch (key->both.offset & (FUT_OFF_INODE|FUT_OFF_MMSHARED)) { | 286 | switch (key->both.offset & (FUT_OFF_INODE|FUT_OFF_MMSHARED)) { |
287 | case FUT_OFF_INODE: | 287 | case FUT_OFF_INODE: |