From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Date: Tue, 29 Jul 2008 08:12:38 +0000 Subject: [patch 3/3] kdump: use is_vmcore_usable() and vmcore_unusable() in reserve_elfcorehdr() Message-Id: <20080729081629.715923799@vergenet.net> List-Id: References: <20080729081235.293361145@vergenet.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kexec@lists.infradead.org, linux-ia64@vger.kernel.org, lkml@vger.kernel.org Cc: Vivek Goyal After recent changes setting elfcorehdr_addr to ELFCORE_ADDR_MAX will cause is_kdump_kernel() to return 0 when it should return 1. Instead use vmcore_unusable(), which has been added for this purpose. Signed-off-by: Simon Horman Index: linux-2.6/arch/ia64/kernel/setup.c =================================--- linux-2.6.orig/arch/ia64/kernel/setup.c 2008-07-29 17:27:43.000000000 +1000 +++ linux-2.6/arch/ia64/kernel/setup.c 2008-07-29 17:50:50.000000000 +1000 @@ -502,11 +502,11 @@ int __init reserve_elfcorehdr(unsigned l * to work properly. */ - if (elfcorehdr_addr >= ELFCORE_ADDR_MAX) + if (!is_vmcore_usable()) return -EINVAL; if ((length = vmcore_find_descriptor_size(elfcorehdr_addr)) = 0) { - elfcorehdr_addr = ELFCORE_ADDR_MAX; + vmcore_unusable(); return -EINVAL; } -- -- Horms