Skip to content

Commit

Permalink
kexec: rename unusebale_pages to unusable_pages
Browse files Browse the repository at this point in the history
Let's use the more common "unusable".

This patch was originally written and posted by Boris. I am including it
in this patch series.

Signed-off-by: Borislav Petkov <[email protected]>
Signed-off-by: Vivek Goyal <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Michael Kerrisk <[email protected]>
Cc: Yinghai Lu <[email protected]>
Cc: Eric Biederman <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Matthew Garrett <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Dave Young <[email protected]>
Cc: WANG Chao <[email protected]>
Cc: Baoquan He <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
rhvgoyal authored and torvalds committed Aug 8, 2014
1 parent de5b56b commit 7d3e2bc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion include/linux/kexec.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ struct kimage {

struct list_head control_pages;
struct list_head dest_pages;
struct list_head unuseable_pages;
struct list_head unusable_pages;

/* Address of next control page to allocate for crash kernels. */
unsigned long control_page;
Expand Down
6 changes: 3 additions & 3 deletions kernel/kexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ static int do_kimage_alloc(struct kimage **rimage, unsigned long entry,
INIT_LIST_HEAD(&image->dest_pages);

/* Initialize the list of unusable pages */
INIT_LIST_HEAD(&image->unuseable_pages);
INIT_LIST_HEAD(&image->unusable_pages);

/* Read in the segments */
image->nr_segments = nr_segments;
Expand Down Expand Up @@ -609,7 +609,7 @@ static void kimage_free_extra_pages(struct kimage *image)
kimage_free_page_list(&image->dest_pages);

/* Walk through and free any unusable pages I have cached */
kimage_free_page_list(&image->unuseable_pages);
kimage_free_page_list(&image->unusable_pages);

}
static void kimage_terminate(struct kimage *image)
Expand Down Expand Up @@ -732,7 +732,7 @@ static struct page *kimage_alloc_page(struct kimage *image,
/* If the page cannot be used file it away */
if (page_to_pfn(page) >
(KEXEC_SOURCE_MEMORY_LIMIT >> PAGE_SHIFT)) {
list_add(&page->lru, &image->unuseable_pages);
list_add(&page->lru, &image->unusable_pages);
continue;
}
addr = page_to_pfn(page) << PAGE_SHIFT;
Expand Down

0 comments on commit 7d3e2bc

Please sign in to comment.