Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6ef57fa authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents f0b9d2d0 29ffb9c1

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 101

SUBLEVEL = 102

EXTRAVERSION =

NAME = Blurry Fish Butt

mm/debug-pagealloc.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

}