diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2021-03-16 09:06:23 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2021-03-16 09:06:23 +0100 |
| commit | f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5 (patch) | |
| tree | 474c8fb8df9797b6e0d1e562b389f575c24afc50 /include/linux/page-flags.h | |
| parent | ccf953d8f3d68e85e577e843fdcde8872b0a9769 (diff) | |
| parent | 51c3b916a4d7e24b4918925965867fdd9bd8dd59 (diff) | |
| download | linux-stable-f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5.tar.gz linux-stable-f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5.tar.bz2 linux-stable-f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5.zip | |
Merge drm/drm-next into drm-misc-next
Noralf needs some patches in 5.12-rc3, and we've been delaying the 5.12
merge due to the swap issue so it looks like a good time.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'include/linux/page-flags.h')
| -rw-r--r-- | include/linux/page-flags.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index ec5d0290e0ee..04a34c08e0a6 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -592,15 +592,9 @@ static inline void ClearPageCompound(struct page *page) #ifdef CONFIG_HUGETLB_PAGE int PageHuge(struct page *page); int PageHeadHuge(struct page *page); -bool page_huge_active(struct page *page); #else TESTPAGEFLAG_FALSE(Huge) TESTPAGEFLAG_FALSE(HeadHuge) - -static inline bool page_huge_active(struct page *page) -{ - return 0; -} #endif @@ -816,7 +810,7 @@ static inline void ClearPageSlabPfmemalloc(struct page *page) /* * Flags checked when a page is freed. Pages being freed should not have - * these flags set. It they are, there is a problem. + * these flags set. If they are, there is a problem. */ #define PAGE_FLAGS_CHECK_AT_FREE \ (1UL << PG_lru | 1UL << PG_locked | \ @@ -827,7 +821,7 @@ static inline void ClearPageSlabPfmemalloc(struct page *page) /* * Flags checked when a page is prepped for return by the page allocator. - * Pages being prepped should not have these flags set. It they are set, + * Pages being prepped should not have these flags set. If they are set, * there has been a kernel bug or struct page corruption. * * __PG_HWPOISON is exceptional because it needs to be kept beyond page's |