diff options
author | Anisse Astier <anisse@astier.eu> | 2015-06-24 19:56:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-24 20:49:42 -0400 |
commit | f4d2897b930cb546d435f64fd4b74ea5d1223dff (patch) | |
tree | e3a8aa330d6cb5fc4acdc1eef455b0bb26779c63 /mm/page_alloc.c | |
parent | c761471b58e6138938ebc6eafec20b2f60cb3397 (diff) |
mm/page_alloc.c: cleanup obsolete KM_USER*
It's been five years now that KM_* kmap flags have been removed and that
we can call clear_highpage from any context. So we remove prep_zero_pages
accordingly.
Signed-off-by: Anisse Astier <anisse@astier.eu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 159dbbc3375d..7a5cbe7cc9b6 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -380,20 +380,6 @@ void prep_compound_page(struct page *page, unsigned long order) | |||
380 | } | 380 | } |
381 | } | 381 | } |
382 | 382 | ||
383 | static inline void prep_zero_page(struct page *page, unsigned int order, | ||
384 | gfp_t gfp_flags) | ||
385 | { | ||
386 | int i; | ||
387 | |||
388 | /* | ||
389 | * clear_highpage() will use KM_USER0, so it's a bug to use __GFP_ZERO | ||
390 | * and __GFP_HIGHMEM from hard or soft interrupt context. | ||
391 | */ | ||
392 | VM_BUG_ON((gfp_flags & __GFP_HIGHMEM) && in_interrupt()); | ||
393 | for (i = 0; i < (1 << order); i++) | ||
394 | clear_highpage(page + i); | ||
395 | } | ||
396 | |||
397 | #ifdef CONFIG_DEBUG_PAGEALLOC | 383 | #ifdef CONFIG_DEBUG_PAGEALLOC |
398 | unsigned int _debug_guardpage_minorder; | 384 | unsigned int _debug_guardpage_minorder; |
399 | bool _debug_pagealloc_enabled __read_mostly; | 385 | bool _debug_pagealloc_enabled __read_mostly; |
@@ -975,7 +961,8 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags, | |||
975 | kasan_alloc_pages(page, order); | 961 | kasan_alloc_pages(page, order); |
976 | 962 | ||
977 | if (gfp_flags & __GFP_ZERO) | 963 | if (gfp_flags & __GFP_ZERO) |
978 | prep_zero_page(page, order, gfp_flags); | 964 | for (i = 0; i < (1 << order); i++) |
965 | clear_highpage(page + i); | ||
979 | 966 | ||
980 | if (order && (gfp_flags & __GFP_COMP)) | 967 | if (order && (gfp_flags & __GFP_COMP)) |
981 | prep_compound_page(page, order); | 968 | prep_compound_page(page, order); |