diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/futex.c | 4 | ||||
-rw-r--r-- | kernel/kexec.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index d725676d84f3..e45a65e41686 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -293,7 +293,7 @@ EXPORT_SYMBOL_GPL(get_futex_key_refs); | |||
293 | */ | 293 | */ |
294 | void drop_futex_key_refs(union futex_key *key) | 294 | void drop_futex_key_refs(union futex_key *key) |
295 | { | 295 | { |
296 | if (key->both.ptr == 0) | 296 | if (!key->both.ptr) |
297 | return; | 297 | return; |
298 | switch (key->both.offset & (FUT_OFF_INODE|FUT_OFF_MMSHARED)) { | 298 | switch (key->both.offset & (FUT_OFF_INODE|FUT_OFF_MMSHARED)) { |
299 | case FUT_OFF_INODE: | 299 | case FUT_OFF_INODE: |
@@ -1046,7 +1046,7 @@ static int unqueue_me(struct futex_q *q) | |||
1046 | retry: | 1046 | retry: |
1047 | lock_ptr = q->lock_ptr; | 1047 | lock_ptr = q->lock_ptr; |
1048 | barrier(); | 1048 | barrier(); |
1049 | if (lock_ptr != 0) { | 1049 | if (lock_ptr != NULL) { |
1050 | spin_lock(lock_ptr); | 1050 | spin_lock(lock_ptr); |
1051 | /* | 1051 | /* |
1052 | * q->lock_ptr can change between reading it and | 1052 | * q->lock_ptr can change between reading it and |
diff --git a/kernel/kexec.c b/kernel/kexec.c index 7885269b0da2..e9f1b4ea504d 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
@@ -785,7 +785,7 @@ static int kimage_load_normal_segment(struct kimage *image, | |||
785 | size_t uchunk, mchunk; | 785 | size_t uchunk, mchunk; |
786 | 786 | ||
787 | page = kimage_alloc_page(image, GFP_HIGHUSER, maddr); | 787 | page = kimage_alloc_page(image, GFP_HIGHUSER, maddr); |
788 | if (page == 0) { | 788 | if (!page) { |
789 | result = -ENOMEM; | 789 | result = -ENOMEM; |
790 | goto out; | 790 | goto out; |
791 | } | 791 | } |
@@ -844,7 +844,7 @@ static int kimage_load_crash_segment(struct kimage *image, | |||
844 | size_t uchunk, mchunk; | 844 | size_t uchunk, mchunk; |
845 | 845 | ||
846 | page = pfn_to_page(maddr >> PAGE_SHIFT); | 846 | page = pfn_to_page(maddr >> PAGE_SHIFT); |
847 | if (page == 0) { | 847 | if (!page) { |
848 | result = -ENOMEM; | 848 | result = -ENOMEM; |
849 | goto out; | 849 | goto out; |
850 | } | 850 | } |