diff options
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0541288ebf4b..a2995a5d012c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -154,7 +154,7 @@ static void prep_compound_page(struct page *page, unsigned long order) | |||
154 | struct page *p = page + i; | 154 | struct page *p = page + i; |
155 | 155 | ||
156 | SetPageCompound(p); | 156 | SetPageCompound(p); |
157 | p->private = (unsigned long)page; | 157 | set_page_private(p, (unsigned long)page); |
158 | } | 158 | } |
159 | } | 159 | } |
160 | 160 | ||
@@ -174,7 +174,7 @@ static void destroy_compound_page(struct page *page, unsigned long order) | |||
174 | 174 | ||
175 | if (!PageCompound(p)) | 175 | if (!PageCompound(p)) |
176 | bad_page(__FUNCTION__, page); | 176 | bad_page(__FUNCTION__, page); |
177 | if (p->private != (unsigned long)page) | 177 | if (page_private(p) != (unsigned long)page) |
178 | bad_page(__FUNCTION__, page); | 178 | bad_page(__FUNCTION__, page); |
179 | ClearPageCompound(p); | 179 | ClearPageCompound(p); |
180 | } | 180 | } |
@@ -187,18 +187,18 @@ static void destroy_compound_page(struct page *page, unsigned long order) | |||
187 | * So, we don't need atomic page->flags operations here. | 187 | * So, we don't need atomic page->flags operations here. |
188 | */ | 188 | */ |
189 | static inline unsigned long page_order(struct page *page) { | 189 | static inline unsigned long page_order(struct page *page) { |
190 | return page->private; | 190 | return page_private(page); |
191 | } | 191 | } |
192 | 192 | ||
193 | static inline void set_page_order(struct page *page, int order) { | 193 | static inline void set_page_order(struct page *page, int order) { |
194 | page->private = order; | 194 | set_page_private(page, order); |
195 | __SetPagePrivate(page); | 195 | __SetPagePrivate(page); |
196 | } | 196 | } |
197 | 197 | ||
198 | static inline void rmv_page_order(struct page *page) | 198 | static inline void rmv_page_order(struct page *page) |
199 | { | 199 | { |
200 | __ClearPagePrivate(page); | 200 | __ClearPagePrivate(page); |
201 | page->private = 0; | 201 | set_page_private(page, 0); |
202 | } | 202 | } |
203 | 203 | ||
204 | /* | 204 | /* |
@@ -238,7 +238,7 @@ __find_combined_index(unsigned long page_idx, unsigned int order) | |||
238 | * (a) the buddy is free && | 238 | * (a) the buddy is free && |
239 | * (b) the buddy is on the buddy system && | 239 | * (b) the buddy is on the buddy system && |
240 | * (c) a page and its buddy have the same order. | 240 | * (c) a page and its buddy have the same order. |
241 | * for recording page's order, we use page->private and PG_private. | 241 | * for recording page's order, we use page_private(page) and PG_private. |
242 | * | 242 | * |
243 | */ | 243 | */ |
244 | static inline int page_is_buddy(struct page *page, int order) | 244 | static inline int page_is_buddy(struct page *page, int order) |
@@ -264,7 +264,7 @@ static inline int page_is_buddy(struct page *page, int order) | |||
264 | * parts of the VM system. | 264 | * parts of the VM system. |
265 | * At each level, we keep a list of pages, which are heads of continuous | 265 | * At each level, we keep a list of pages, which are heads of continuous |
266 | * free pages of length of (1 << order) and marked with PG_Private.Page's | 266 | * free pages of length of (1 << order) and marked with PG_Private.Page's |
267 | * order is recorded in page->private field. | 267 | * order is recorded in page_private(page) field. |
268 | * So when we are allocating or freeing one, we can derive the state of the | 268 | * So when we are allocating or freeing one, we can derive the state of the |
269 | * other. That is, if we allocate a small block, and both were | 269 | * other. That is, if we allocate a small block, and both were |
270 | * free, the remainder of the region must be split into blocks. | 270 | * free, the remainder of the region must be split into blocks. |
@@ -463,7 +463,7 @@ static void prep_new_page(struct page *page, int order) | |||
463 | page->flags &= ~(1 << PG_uptodate | 1 << PG_error | | 463 | page->flags &= ~(1 << PG_uptodate | 1 << PG_error | |
464 | 1 << PG_referenced | 1 << PG_arch_1 | | 464 | 1 << PG_referenced | 1 << PG_arch_1 | |
465 | 1 << PG_checked | 1 << PG_mappedtodisk); | 465 | 1 << PG_checked | 1 << PG_mappedtodisk); |
466 | page->private = 0; | 466 | set_page_private(page, 0); |
467 | set_page_refs(page, order); | 467 | set_page_refs(page, order); |
468 | kernel_map_pages(page, 1 << order, 1); | 468 | kernel_map_pages(page, 1 << order, 1); |
469 | } | 469 | } |