diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:56:31 -0500 | 
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:56:31 -0500 | 
| commit | 81cfb8864c73230eb1c37753aba517db15cf4d8f (patch) | |
| tree | 649ff25543834cf9983ea41b93126bea97d75475 /kernel/kexec.c | |
| parent | 0169e284f6b6b263cc7c2ed25986b96cd6fda610 (diff) | |
| parent | 9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43 (diff) | |
Merge branch 'master'
Diffstat (limited to 'kernel/kexec.c')
| -rw-r--r-- | kernel/kexec.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index 36c5d9cd4cc1..2c95848fbce8 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c  | |||
| @@ -334,7 +334,7 @@ static struct page *kimage_alloc_pages(gfp_t gfp_mask, unsigned int order) | |||
| 334 | if (pages) { | 334 | if (pages) { | 
| 335 | unsigned int count, i; | 335 | unsigned int count, i; | 
| 336 | pages->mapping = NULL; | 336 | pages->mapping = NULL; | 
| 337 | pages->private = order; | 337 | set_page_private(pages, order); | 
| 338 | count = 1 << order; | 338 | count = 1 << order; | 
| 339 | for (i = 0; i < count; i++) | 339 | for (i = 0; i < count; i++) | 
| 340 | SetPageReserved(pages + i); | 340 | SetPageReserved(pages + i); | 
| @@ -347,7 +347,7 @@ static void kimage_free_pages(struct page *page) | |||
| 347 | { | 347 | { | 
| 348 | unsigned int order, count, i; | 348 | unsigned int order, count, i; | 
| 349 | 349 | ||
| 350 | order = page->private; | 350 | order = page_private(page); | 
| 351 | count = 1 << order; | 351 | count = 1 << order; | 
| 352 | for (i = 0; i < count; i++) | 352 | for (i = 0; i < count; i++) | 
| 353 | ClearPageReserved(page + i); | 353 | ClearPageReserved(page + i); | 
