提交 630bf207 编写于 作者: S Simon Horman 提交者: Linus Torvalds

kdump: use is_kdump_kernel() in sba_init()

o Make use of is_kdump_kernel() rather than checking elfcorehdr_addr directly.

o Remove CONFIG_CRASH_DUMP as is_kdump_kernel() is safe to call anywhere

o Remove CONFIG_PROC_FS as it is bogus, the check
  should occur regardless of if CONFIG_PROC_FS is set or not.
Signed-off-by: NSimon Horman <horms@verge.net.au>
Acked-by: NVivek Goyal <vgoyal@redhat.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 e515a0d6
...@@ -2070,14 +2070,13 @@ sba_init(void) ...@@ -2070,14 +2070,13 @@ sba_init(void)
if (!ia64_platform_is("hpzx1") && !ia64_platform_is("hpzx1_swiotlb")) if (!ia64_platform_is("hpzx1") && !ia64_platform_is("hpzx1_swiotlb"))
return 0; return 0;
#if defined(CONFIG_IA64_GENERIC) && defined(CONFIG_CRASH_DUMP) && \ #if defined(CONFIG_IA64_GENERIC)
defined(CONFIG_PROC_FS)
/* If we are booting a kdump kernel, the sba_iommu will /* If we are booting a kdump kernel, the sba_iommu will
* cause devices that were not shutdown properly to MCA * cause devices that were not shutdown properly to MCA
* as soon as they are turned back on. Our only option for * as soon as they are turned back on. Our only option for
* a successful kdump kernel boot is to use the swiotlb. * a successful kdump kernel boot is to use the swiotlb.
*/ */
if (elfcorehdr_addr < ELFCORE_ADDR_MAX) { if (is_kdump_kernel()) {
if (swiotlb_late_init_with_default_size(64 * (1<<20)) != 0) if (swiotlb_late_init_with_default_size(64 * (1<<20)) != 0)
panic("Unable to initialize software I/O TLB:" panic("Unable to initialize software I/O TLB:"
" Try machvec=dig boot option"); " Try machvec=dig boot option");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册