aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivek Goyal <vgoyal@redhat.com>2014-08-08 17:25:43 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-08 18:57:32 -0400
commit7d3e2bca22feb1f4a624009ff6c15e6f724cb4e7 (patch)
tree482b50d407ab91ae7b01189d0802f09edecb0474
parentde5b56ba51f63973ceb5c184ee0855f0c8a13fc9 (diff)
kexec: rename unusebale_pages to unusable_pages
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 <bp@suse.de> Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Cc: Borislav Petkov <bp@suse.de> Cc: Michael Kerrisk <mtk.manpages@gmail.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Eric Biederman <ebiederm@xmission.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Matthew Garrett <mjg59@srcf.ucam.org> Cc: Greg Kroah-Hartman <greg@kroah.com> Cc: Dave Young <dyoung@redhat.com> Cc: WANG Chao <chaowang@redhat.com> Cc: Baoquan He <bhe@redhat.com> Cc: Andy Lutomirski <luto@amacapital.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/kexec.h2
-rw-r--r--kernel/kexec.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index a75641930049..d9bb0a57d208 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -100,7 +100,7 @@ struct kimage {
100 100
101 struct list_head control_pages; 101 struct list_head control_pages;
102 struct list_head dest_pages; 102 struct list_head dest_pages;
103 struct list_head unuseable_pages; 103 struct list_head unusable_pages;
104 104
105 /* Address of next control page to allocate for crash kernels. */ 105 /* Address of next control page to allocate for crash kernels. */
106 unsigned long control_page; 106 unsigned long control_page;
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 4b8f0c925884..c7cc2a00181c 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -154,7 +154,7 @@ static int do_kimage_alloc(struct kimage **rimage, unsigned long entry,
154 INIT_LIST_HEAD(&image->dest_pages); 154 INIT_LIST_HEAD(&image->dest_pages);
155 155
156 /* Initialize the list of unusable pages */ 156 /* Initialize the list of unusable pages */
157 INIT_LIST_HEAD(&image->unuseable_pages); 157 INIT_LIST_HEAD(&image->unusable_pages);
158 158
159 /* Read in the segments */ 159 /* Read in the segments */
160 image->nr_segments = nr_segments; 160 image->nr_segments = nr_segments;
@@ -609,7 +609,7 @@ static void kimage_free_extra_pages(struct kimage *image)
609 kimage_free_page_list(&image->dest_pages); 609 kimage_free_page_list(&image->dest_pages);
610 610
611 /* Walk through and free any unusable pages I have cached */ 611 /* Walk through and free any unusable pages I have cached */
612 kimage_free_page_list(&image->unuseable_pages); 612 kimage_free_page_list(&image->unusable_pages);
613 613
614} 614}
615static void kimage_terminate(struct kimage *image) 615static void kimage_terminate(struct kimage *image)
@@ -732,7 +732,7 @@ static struct page *kimage_alloc_page(struct kimage *image,
732 /* If the page cannot be used file it away */ 732 /* If the page cannot be used file it away */
733 if (page_to_pfn(page) > 733 if (page_to_pfn(page) >
734 (KEXEC_SOURCE_MEMORY_LIMIT >> PAGE_SHIFT)) { 734 (KEXEC_SOURCE_MEMORY_LIMIT >> PAGE_SHIFT)) {
735 list_add(&page->lru, &image->unuseable_pages); 735 list_add(&page->lru, &image->unusable_pages);
736 continue; 736 continue;
737 } 737 }
738 addr = page_to_pfn(page) << PAGE_SHIFT; 738 addr = page_to_pfn(page) << PAGE_SHIFT;