From 7c156b2c3d3c83a8f30e164080238f372ef52088 Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Mon, 20 Oct 2008 13:51:52 +0900 Subject: [PATCH] --- yaml --- r: 118131 b: refs/heads/master c: e7706fc691513b0f06adb3de3d6ac04293180146 h: refs/heads/master i: 118129: 06231ed17bf59f4a4777486130858e5c6253dd69 118127: 5ff2f3bb6442fb5cb681fe7d76433d51a669ca1f v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/machine_kexec_32.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bbac4ed1fdf6..543ba9c7a46c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1281675e9c0d4d42d993697f4daab45ef22d49da +refs/heads/master: e7706fc691513b0f06adb3de3d6ac04293180146 diff --git a/trunk/arch/x86/kernel/machine_kexec_32.c b/trunk/arch/x86/kernel/machine_kexec_32.c index 0732adba05ca..7a385746509a 100644 --- a/trunk/arch/x86/kernel/machine_kexec_32.c +++ b/trunk/arch/x86/kernel/machine_kexec_32.c @@ -162,7 +162,10 @@ void machine_kexec(struct kimage *image) page_list[VA_PTE_0] = (unsigned long)kexec_pte0; page_list[PA_PTE_1] = __pa(kexec_pte1); page_list[VA_PTE_1] = (unsigned long)kexec_pte1; - page_list[PA_SWAP_PAGE] = (page_to_pfn(image->swap_page) << PAGE_SHIFT); + + if (image->type == KEXEC_TYPE_DEFAULT) + page_list[PA_SWAP_PAGE] = (page_to_pfn(image->swap_page) + << PAGE_SHIFT); /* The segment registers are funny things, they have both a * visible and an invisible part. Whenever the visible part is