Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d3e2bca authored by Vivek Goyal's avatar Vivek Goyal Committed by Linus Torvalds
Browse files

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: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarVivek 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent de5b56ba

include/linux/kexec.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

kernel/kexec.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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)
@@ -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;