|
@@ -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");
|