forked from luck/tmp_suning_uos_patched
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: Simon Horman <horms@verge.net.au> Acked-by: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
e515a0d600
commit
630bf20747
|
@ -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");
|
||||
|
|
Loading…
Reference in New Issue
Block a user