Commit 2d6c666e authored by Paul Jackson's avatar Paul Jackson Committed by Linus Torvalds
Browse files

[PATCH] mm: gfp_noreclaim cleanup 



Remove last remnant of the defunct early reclaim page logic, the no longer
used __GFP_NORECLAIM flag bit.

Signed-off-by: default avatarPaul Jackson <pj@sgi.com>
Acked-by: default avatarMartin Hicks <mort@bork.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7fb1d9fc

include/linux/gfp.h

+2 −3
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ struct vm_area_struct; 
#define __GFP_COMP	((__force gfp_t)0x4000u)/* Add compound page metadata */

#define __GFP_ZERO	((__force gfp_t)0x8000u)/* Return zeroed page on success */

#define __GFP_NOMEMALLOC ((__force gfp_t)0x10000u) /* Don't use emergency reserves */

#define __GFP_NORECLAIM  ((__force gfp_t)0x20000u) /* No realy zone reclaim during allocation */

#define __GFP_HARDWALL   ((__force gfp_t)0x40000u) /* Enforce hardwall cpuset memory allocs */

#define __GFP_HARDWALL   ((__force gfp_t)0x20000u) /* Enforce hardwall cpuset memory allocs */



#define __GFP_BITS_SHIFT 20	/* Room for 20 __GFP_FOO bits */

#define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
@@ -49,7 +48,7 @@ struct vm_area_struct; 
#define GFP_LEVEL_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS| \

			__GFP_COLD|__GFP_NOWARN|__GFP_REPEAT| \

			__GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP| \

			__GFP_NOMEMALLOC|__GFP_NORECLAIM|__GFP_HARDWALL)

			__GFP_NOMEMALLOC|__GFP_HARDWALL)



#define GFP_ATOMIC	(__GFP_HIGH)

#define GFP_NOIO	(__GFP_WAIT)

include/linux/pagemap.h

+2 −2
Original line number Diff line number Diff line
@@ -53,12 +53,12 @@ void release_pages(struct page **pages, int nr, int cold); 


static inline struct page *page_cache_alloc(struct address_space *x)

{

	return alloc_pages(mapping_gfp_mask(x)|__GFP_NORECLAIM, 0);

	return alloc_pages(mapping_gfp_mask(x), 0);

}



static inline struct page *page_cache_alloc_cold(struct address_space *x)

{

	return alloc_pages(mapping_gfp_mask(x)|__GFP_COLD|__GFP_NORECLAIM, 0);

	return alloc_pages(mapping_gfp_mask(x)|__GFP_COLD, 0);

}



typedef int filler_t(void *, struct page *);