On Mon, Jul 28, 2008 at 12:45:28PM +1000, Simon Horman wrote: > The rfc patch I made to rename is_kdump_kernel to kernel_has_vmcore, > which I appended to my previous post should have looked more like the > following. Although, as I noted in my previous post, its more a starting > point for discussion than a solution to the problem at hand. Sorry, one more time. I forgot to quilt refresh. Index: linux-2.6/arch/x86/kernel/pci-calgary_64.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/pci-calgary_64.c 2008-07-28 10:10:31.000000000 +1000 +++ linux-2.6/arch/x86/kernel/pci-calgary_64.c 2008-07-28 10:14:24.000000000 +1000 @@ -801,7 +801,7 @@ static int __init calgary_setup_tar(stru tbl = pci_iommu(dev->bus); tbl->it_base = (unsigned long)bus_info[dev->bus->number].tce_space; - if (is_kdump_kernel()) + if (kernel_has_vmcore()) calgary_init_bitmap_from_tce_table(tbl); else tce_free(tbl, 0, tbl->it_size); @@ -1184,7 +1184,7 @@ static int __init calgary_init(void) return ret; /* Purely for kdump kernel case */ - if (is_kdump_kernel()) + if (kernel_has_vmcore()) get_tce_space_from_tar(); do { @@ -1438,7 +1438,7 @@ void __init detect_calgary(void) return; } - specified_table_size = determine_tce_table_size((is_kdump_kernel() ? + specified_table_size = determine_tce_table_size((kernel_has_vmcore() ? saved_max_pfn : max_pfn) * PAGE_SIZE); for (bus = 0; bus < MAX_PHB_BUS_NUM; bus++) { @@ -1461,7 +1461,7 @@ void __init detect_calgary(void) * If it is kdump kernel, find and use tce tables * from first kernel, else allocate tce tables here */ - if (!is_kdump_kernel()) { + if (!kernel_has_vmcore()) { tbl = alloc_tce_table(); if (!tbl) goto cleanup; Index: linux-2.6/fs/proc/vmcore.c =================================================================== --- linux-2.6.orig/fs/proc/vmcore.c 2008-07-28 09:51:30.000000000 +1000 +++ linux-2.6/fs/proc/vmcore.c 2008-07-28 09:51:53.000000000 +1000 @@ -32,8 +32,7 @@ static size_t elfcorebuf_sz; /* Total size of vmcore file. */ static u64 vmcore_size; -/* Stores the physical address of elf header of crash image. */ -unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX; +unsigned long long elfcorehdr_addr; struct proc_dir_entry *proc_vmcore = NULL; Index: linux-2.6/include/linux/crash_dump.h =================================================================== --- linux-2.6.orig/include/linux/crash_dump.h 2008-07-28 09:46:29.000000000 +1000 +++ linux-2.6/include/linux/crash_dump.h 2008-07-28 12:11:57.000000000 +1000 @@ -9,12 +9,6 @@ #define ELFCORE_ADDR_MAX (-1ULL) -#ifdef CONFIG_PROC_VMCORE -extern unsigned long long elfcorehdr_addr; -#else -static const unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX; -#endif - extern ssize_t copy_oldmem_page(unsigned long, char *, size_t, unsigned long, int); extern const struct file_operations proc_vmcore_operations; @@ -28,13 +22,18 @@ extern struct proc_dir_entry *proc_vmcor #define vmcore_elf_check_arch(x) (elf_check_arch(x) || vmcore_elf_check_arch_cross(x)) -static inline int is_kdump_kernel(void) -{ - return (elfcorehdr_addr != ELFCORE_ADDR_MAX) ? 1 : 0; -} -#else /* !CONFIG_CRASH_DUMP */ -static inline int is_kdump_kernel(void) { return 0; } #endif /* CONFIG_CRASH_DUMP */ extern unsigned long saved_max_pfn; #endif /* LINUX_CRASHDUMP_H */ + +#ifdef CONFIG_PROC_VMCORE +extern unsigned long long elfcorehdr_addr; + +static inline int kernel_has_vmcore(void) +{ + return (elfcorehdr_addr != ELFCORE_ADDR_MAX) ? 1 : 0; +} +#else +static inline int kernel_has_vmcore(void) { return 0; } +#endif Index: linux-2.6/arch/ia64/hp/common/sba_iommu.c =================================================================== --- linux-2.6.orig/arch/ia64/hp/common/sba_iommu.c 2008-07-28 11:51:36.000000000 +1000 +++ linux-2.6/arch/ia64/hp/common/sba_iommu.c 2008-07-28 12:11:27.000000000 +1000 @@ -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_PROC_VMCORE) && \ - 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 (kernel_has_vmcore()) { if (swiotlb_late_init_with_default_size(64 * (1<<20)) != 0) panic("Unable to initialize software I/O TLB:" " Try machvec=dig boot option"); -- To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |