diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2017-11-24 11:38:32 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2017-11-24 11:38:32 +0100 |
| commit | f6ef57faf95de12502e3c41534344c19fba5415f (patch) | |
| tree | 6e25a99fc3bb4362b9944ed455a97c155beed3e3 | |
| parent | f0b9d2d0acea78a0d77181974f94d595df58aa88 (diff) | |
| parent | 29ffb9c1fb4acbda207985ad1558191ffb776bee (diff) | |
Merge 4.4.102 into android-4.4
Changes in 4.4.102
mm, hwpoison: fixup "mm: check the return value of lookup_page_ext for all call sites"
Linux 4.4.102
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | mm/debug-pagealloc.c | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 101 +SUBLEVEL = 102 EXTRAVERSION = NAME = Blurry Fish Butt diff --git a/mm/debug-pagealloc.c b/mm/debug-pagealloc.c index fe1c61f7cf26..3b8f1b83610e 100644 --- a/mm/debug-pagealloc.c +++ b/mm/debug-pagealloc.c @@ -34,7 +34,7 @@ static inline void set_page_poison(struct page *page) struct page_ext *page_ext; page_ext = lookup_page_ext(page); - if (page_ext) + if (!page_ext) return; __set_bit(PAGE_EXT_DEBUG_POISON, &page_ext->flags); } @@ -44,7 +44,7 @@ static inline void clear_page_poison(struct page *page) struct page_ext *page_ext; page_ext = lookup_page_ext(page); - if (page_ext) + if (!page_ext) return; __clear_bit(PAGE_EXT_DEBUG_POISON, &page_ext->flags); } @@ -54,7 +54,7 @@ static inline bool page_poison(struct page *page) struct page_ext *page_ext; page_ext = lookup_page_ext(page); - if (page_ext) + if (!page_ext) return false; return test_bit(PAGE_EXT_DEBUG_POISON, &page_ext->flags); } |