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

Commit 630bf207 authored by Simon Horman's avatar Simon Horman Committed by Linus Torvalds
Browse files

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: default avatarSimon Horman <horms@verge.net.au>
Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e515a0d6

arch/ia64/hp/common/sba_iommu.c

+2 −3
Original line number Diff line number Diff line
@@ -2070,14 +2070,13 @@ sba_init(void) 
	if (!ia64_platform_is("hpzx1") && !ia64_platform_is("hpzx1_swiotlb"))

		return 0;



#if defined(CONFIG_IA64_GENERIC) && defined(CONFIG_CRASH_DUMP) && \

        defined(CONFIG_PROC_FS)

#if defined(CONFIG_IA64_GENERIC)

	/* If we are booting a kdump kernel, the sba_iommu will

	 * cause devices that were not shutdown properly to MCA

	 * as soon as they are turned back on.  Our only option for

	 * 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)

			panic("Unable to initialize software I/O TLB:"

				  " Try machvec=dig boot option");