File crash-4.0-2.33-3.1.patch of Package crash

Overview Repositories Revisions Requests Users Attributes Meta

File crash-4.0-2.33-3.1.patch of Package crash (Revision c1bc67168c997b363420d83149e8c6f5)

Currently displaying revision c1bc67168c997b363420d83149e8c6f5 , Show latest

diff -purN crash-4.0-2.33/.rh_rpm_package crash-4.0-3.1/.rh_rpm_package
--- crash-4.0-2.33/.rh_rpm_package	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/.rh_rpm_package	2006-08-04 17:24:00.000000000 +0200
@@ -1 +1 @@
-4.0-2.33
+4.0-3.1
diff -purN crash-4.0-2.33/Makefile crash-4.0-3.1/Makefile
--- crash-4.0-2.33/Makefile	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/Makefile	2006-08-04 17:24:00.000000000 +0200
@@ -446,7 +446,7 @@ do_tar:
 # spec file will have its own release number, which will in turn get passed 
 # to the "all" target upon the initial build.
 
-RELEASE=4.0-2.33
+RELEASE=4.0-3.1
 
 release: make_configure
 	@if [ "`id --user`" != "0" ]; then \
diff -purN crash-4.0-2.33/README crash-4.0-3.1/README
--- crash-4.0-2.33/README	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/README	2006-08-04 17:24:00.000000000 +0200
@@ -69,7 +69,7 @@
      After the kernel is re-compiled, the uncompressed "vmlinux" kernel
      that is created in the top-level kernel build directory must be saved.
 
-  To build this utility, simply uncompress the tar file, enter the crash-4.0-2.33
+  To build this utility, simply uncompress the tar file, enter the crash-4.0-3.1
   subdirectory, and type "make".  The initial build will take several minutes 
   because the gdb module must be configured and and built.  Alternatively, the
   crash source RPM file may be installed and built, and the resultant crash
@@ -89,7 +89,7 @@
 
     $ crash
     
-    crash 4.0-2.33
+    crash 4.0-3.1
     Copyright (C) 2002, 2003, 2004, 2005, 2006  Red Hat, Inc.
     Copyright (C) 2004, 2005, 2006  IBM Corporation
     Copyright (C) 1999-2006  Hewlett-Packard Co
@@ -113,7 +113,7 @@
           KERNEL: /boot/vmlinux
         DUMPFILE: /dev/mem
             CPUS: 1
-            DATE: Thu Jul 13 14:51:50 2006
+            DATE: Fri Aug  4 11:24:00 2006
           UPTIME: 10 days, 22:55:18
     LOAD AVERAGE: 0.08, 0.03, 0.01
            TASKS: 42
@@ -141,7 +141,7 @@
     exit           log            rd             task           
     extend         mach           repeat         timer          
     
-    crash version: 4.0-2.33   gdb version: 6.1
+    crash version: 4.0-3.1   gdb version: 6.1
     For help on any command above, enter "help <command>".
     For help on input options, enter "help input".
     For help on output options, enter "help output".
@@ -154,7 +154,7 @@
 
     $ crash vmlinux vmcore
  
-    crash 4.0-2.33
+    crash 4.0-3.1
     Copyright (C) 2002, 2003, 2004, 2005, 2006  Red Hat, Inc.
     Copyright (C) 2004, 2005, 2006  IBM Corporation
     Copyright (C) 1999-2006  Hewlett-Packard Co
@@ -200,7 +200,7 @@
 
     $ crash vmlinux.17 lcore.cr.17
 
-    crash 4.0-2.33
+    crash 4.0-3.1
     Copyright (C) 2002, 2003, 2004, 2005, 2006  Red Hat, Inc.
     Copyright (C) 2004, 2005, 2006  IBM Corporation
     Copyright (C) 1999-2006  Hewlett-Packard Co
diff -purN crash-4.0-2.33/alpha.c crash-4.0-3.1/alpha.c
--- crash-4.0-2.33/alpha.c	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/alpha.c	2006-08-04 17:24:00.000000000 +0200
@@ -186,7 +186,8 @@ alpha_init(int when)
 				"irq_desc", NULL, 0);
         	else
                 	machdep->nr_irqs = 0;
-		machdep->hz = HZ;
+		if (!machdep->hz)
+			machdep->hz = HZ;
 		break;
 
 	case POST_INIT:
diff -purN crash-4.0-2.33/defs.h crash-4.0-3.1/defs.h
--- crash-4.0-2.33/defs.h	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/defs.h	2006-08-04 17:24:00.000000000 +0200
@@ -429,6 +429,7 @@ struct new_utsname {
 #define GCC_3_3_3     (0x8000)
 #define USE_OLD_BT   (0x10000)
 #define ARCH_XEN     (0x20000)
+#define NO_IKCONFIG  (0x40000)
 
 #define GCC_VERSION_DEPRECATED (GCC_3_2|GCC_3_2_3|GCC_2_96|GCC_3_3_2|GCC_3_3_3)
 
@@ -453,6 +454,7 @@ struct kernel_table {                   
 	ulong init_end;
 	ulong end;
 	int cpus;
+	char *cpus_override;
 	void (*display_bh)(void);
         ulong module_list;
         ulong kernel_module;
@@ -701,9 +703,11 @@ struct machdep_table {
         	char **file;
 	} *line_number_hooks;
 	ulong last_pgd_read;
+	ulong last_pud_read;
 	ulong last_pmd_read;
 	ulong last_ptbl_read;
 	char *pgd;
+	char *pud;
  	char *pmd;	
 	char *ptbl;
 	int ptrs_per_pgd;
@@ -729,12 +733,18 @@ struct machdep_table {
 #define MACHDEP_BT_TEXT (0x10000000)
 #define DEVMEMRD         (0x8000000)
 #define INIT             (0x4000000)
+#define VM_4_LEVEL       (0x2000000)
 
 extern struct machdep_table *machdep;
 
+#ifndef HZ
+#define HZ sysconf(_SC_CLK_TCK)
+#endif
+
 #define IS_LAST_PGD_READ(pgd)     ((ulong)(pgd) == machdep->last_pgd_read)
 #define IS_LAST_PMD_READ(pmd)     ((ulong)(pmd) == machdep->last_pmd_read)
 #define IS_LAST_PTBL_READ(ptbl)   ((ulong)(ptbl) == machdep->last_ptbl_read)
+#define IS_LAST_PUD_READ(pud)     ((ulong)(pud) == machdep->last_pud_read)
 
 #define FILL_PGD(PGD, TYPE, SIZE) 					    \
     if (!IS_LAST_PGD_READ(PGD)) {                                           \
@@ -743,6 +753,13 @@ extern struct machdep_table *machdep;
             machdep->last_pgd_read = (ulong)(PGD);                          \
     }								            
 
+#define FILL_PUD(PUD, TYPE, SIZE) 					    \
+    if (!IS_LAST_PUD_READ(PUD)) {                                           \
+            readmem((ulonglong)((ulong)(PUD)), TYPE, machdep->pud,          \
+                    SIZE, "pud page", FAULT_ON_ERROR);                      \
+            machdep->last_pud_read = (ulong)(PUD);                          \
+    }
+
 #define FILL_PMD(PMD, TYPE, SIZE)			                    \
     if (!IS_LAST_PMD_READ(PMD)) {                                           \
             readmem((ulonglong)(PMD), TYPE, machdep->pmd,                   \
@@ -2117,16 +2134,57 @@ struct load_module {
 
 #define SWITCH_STACK_ADDR(X)  (ia64_get_switch_stack((ulong)(X)))
 
-#define PGDIR_SHIFT     (PAGESHIFT() + 2*(PAGESHIFT()-3))
-#define PMD_SHIFT       (PAGESHIFT() + (PAGESHIFT()-3))
-#define PTRS_PER_PGD    (((ulong)(1)) << (PAGESHIFT()-3))
-#define PTRS_PER_PMD    (((ulong)(1)) << (PAGESHIFT()-3))
-#define PTRS_PER_PTE    (((ulong)(1)) << (PAGESHIFT()-3))
-#define PTRS_PER_PAGE   (((ulong)(1)) << (PAGESHIFT()-3))
 #define __IA64_UL(x)           ((unsigned long)(x))
 #define IA64_MAX_PHYS_BITS  (50)  /* max # of phys address bits (architected) */
 
 /*
+ * How many pointers will a page table level hold expressed in shift 
+ */
+#define PTRS_PER_PTD_SHIFT	(PAGESHIFT()-3)
+
+/*
+ * Definitions for fourth level:
+ */
+#define PTRS_PER_PTE	(__IA64_UL(1) << (PTRS_PER_PTD_SHIFT))
+
+/*
+ * Definitions for third level:
+ *
+ * PMD_SHIFT determines the size of the area a third-level page table
+ * can map.
+ */
+#define PMD_SHIFT	(PAGESHIFT() + (PTRS_PER_PTD_SHIFT))
+#define PMD_SIZE	(1UL << PMD_SHIFT)
+#define PMD_MASK	(~(PMD_SIZE-1))
+#define PTRS_PER_PMD	(1UL << (PTRS_PER_PTD_SHIFT))
+
+/*
+ * PUD_SHIFT determines the size of the area a second-level page table
+ * can map
+ */
+#define PUD_SHIFT	(PMD_SHIFT + (PTRS_PER_PTD_SHIFT))
+#define PUD_SIZE	(1UL << PUD_SHIFT)
+#define PUD_MASK	(~(PUD_SIZE-1))
+#define PTRS_PER_PUD	(1UL << (PTRS_PER_PTD_SHIFT))
+
+/*
+ * Definitions for first level:
+ *
+ * PGDIR_SHIFT determines what a first-level page table entry can map.
+ */
+
+#define PGDIR_SHIFT_4L		(PUD_SHIFT + (PTRS_PER_PTD_SHIFT))
+#define PGDIR_SHIFT_3L		(PMD_SHIFT + (PTRS_PER_PTD_SHIFT))
+/* Turns out 4L & 3L PGDIR_SHIFT are the same (for now) */
+#define PGDIR_SHIFT		PGDIR_SHIFT_4L
+#define PGDIR_SIZE		(__IA64_UL(1) << PGDIR_SHIFT)
+#define PGDIR_MASK		(~(PGDIR_SIZE-1))
+#define PTRS_PER_PGD_SHIFT	PTRS_PER_PTD_SHIFT
+#define PTRS_PER_PGD		(1UL << PTRS_PER_PGD_SHIFT)
+#define USER_PTRS_PER_PGD	(5*PTRS_PER_PGD/8)	/* regions 0-4 are user regions */
+#define FIRST_USER_ADDRESS	0
+
+/*
  * First, define the various bits in a PTE.  Note that the PTE format
  * matches the VHPT short format, the firt doubleword of the VHPD long
  * format, and the first doubleword of the TLB insertion format.
@@ -2178,6 +2236,7 @@ struct load_module {
 #define __DIRTY_BITS		_PAGE_ED | __DIRTY_BITS_NO_ED
 
 #define EFI_PAGE_SHIFT  (12)
+
 /*
  * NOTE: #include'ing <asm/efi.h> creates too many compiler problems, so
  * this stuff is hardwired here; it's probably etched in stone somewhere.
@@ -3343,6 +3402,15 @@ struct remote_file {
 
 ulonglong xen_m2p(ulonglong);
 
+void read_in_kernel_config(int);
+
+#define IKCFG_INIT   (0)
+#define IKCFG_READ   (1)
+
+#define MAGIC_START  "IKCFG_ST"
+#define MAGIC_END    "IKCFG_ED"
+#define MAGIC_SIZE   (sizeof(MAGIC_START) - 1)
+
 /*
  *  dev.c
  */
@@ -3534,7 +3602,6 @@ void ppc64_dump_machdep_table(ulong);
         error(FATAL, "-d option is not applicable to PowerPC architecture\n")
 #define KSYMS_START (0x1)
 #define VM_ORIG     (0x2)
-#define VM_4_LEVEL  (0x4)
 #endif
 
 /*
diff -purN crash-4.0-2.33/help.c crash-4.0-3.1/help.c
--- crash-4.0-2.33/help.c	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/help.c	2006-08-04 17:24:00.000000000 +0200
@@ -2029,7 +2029,7 @@ NULL               
 char *help_sys[] = {
 "sys",
 "system data",
-"[-c [name|number]] ",
+"[-c [name|number]] config",
 "  This command displays system-specific data.  If no arguments are entered,\n"
 "  the same system data shown during %s invocation is shown.\n",
 "    -c [name|number]  If no name or number argument is entered, dump all",
@@ -2039,6 +2039,8 @@ char *help_sys[] = {
 "                      that number is displayed.  If the current output radix",
 "                      has been set to 16, the system call numbers will be ",
 "                      displayed in hexadecimal.",
+"    config            If the kernel was configured with CONFIG_IKCONFIG, then",
+"                      dump the in-kernel configuration data.",
 "    -panic            Panic a live system.  Requires write permission to", 
 "                      /dev/mem.  Results in the %s context causing an",
 "                      \"Attempted to kill the idle task!\" panic.  (The dump",
@@ -2059,6 +2061,27 @@ char *help_sys[] = {
 "         VERSION: #24 SMP Mon Oct 11 17:41:40 CDT 1999",
 "         MACHINE: i686  (500 MHz)",
 "          MEMORY: 1 GB",
+"\n  Dump the system configuration data (if CONFIG_IKCONFIG):\n",
+"    %s> sys config",
+"    #",
+"    # Automatically generated make config: don't edit",
+"    # Linux kernel version: 2.6.16",
+"    # Mon Apr 10 07:58:06 2006",
+"    #",
+"    CONFIG_X86_64=y",
+"    CONFIG_64BIT=y",
+"    CONFIG_X86=y",
+"    CONFIG_SEMAPHORE_SLEEPERS=y",
+"    CONFIG_MMU=y",
+"    CONFIG_RWSEM_GENERIC_SPINLOCK=y",
+"    CONFIG_GENERIC_CALIBRATE_DELAY=y",
+"    CONFIG_X86_CMPXCHG=y",
+"    CONFIG_EARLY_PRINTK=y",
+"    CONFIG_GENERIC_ISA_DMA=y",
+"    CONFIG_GENERIC_IOMAP=y",
+"    CONFIG_ARCH_MAY_HAVE_PC_FDC=y",
+"    CONFIG_DMI=y",
+"    ...",
 "\n  Dump the system call table:\n",
 "    %s> sys -c",
 "    NUM  SYSTEM CALL                FILE AND LINE NUMBER",
diff -purN crash-4.0-2.33/ia64.c crash-4.0-3.1/ia64.c
--- crash-4.0-2.33/ia64.c	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/ia64.c	2006-08-04 17:24:00.000000000 +0200
@@ -25,6 +25,8 @@ static void ia64_old_unwind_init(void);
 static void try_old_unwind(struct bt_info *);
 static void ia64_dump_irq(int);
 static ulong ia64_processor_speed(void);
+static int ia64_vtop_4l(ulong vaddr, physaddr_t *paddr, ulong *pgd, int verbose, int usr);
+static int ia64_vtop(ulong vaddr, physaddr_t *paddr, ulong *pgd, int verbose, int usr);
 static int ia64_uvtop(struct task_context *, ulong, physaddr_t *, int);
 static int ia64_kvtop(struct task_context *, ulong, physaddr_t *, int);
 static ulong ia64_get_task_pgd(ulong);
@@ -101,11 +103,14 @@ ia64_init(int when)
 		}
                 if ((machdep->pgd = (char *)malloc(PAGESIZE())) == NULL)
                         error(FATAL, "cannot malloc pgd space.");
+		if ((machdep->pud = (char *)malloc(PAGESIZE())) == NULL)
+			error(FATAL, "cannot malloc pud space.");
                 if ((machdep->pmd = (char *)malloc(PAGESIZE())) == NULL)
                         error(FATAL, "cannot malloc pmd space.");
                 if ((machdep->ptbl = (char *)malloc(PAGESIZE())) == NULL)
                         error(FATAL, "cannot malloc ptbl space.");
                 machdep->last_pgd_read = 0;
+                machdep->last_pud_read = 0;
                 machdep->last_pmd_read = 0;
                 machdep->last_ptbl_read = 0;
 		machdep->verify_paddr = ia64_verify_paddr;
@@ -118,14 +123,17 @@ ia64_init(int when)
                 break;     
 
         case PRE_GDB:
+
 		if (pc->flags & KERNEL_DEBUG_QUERY)
 			return;
+		
 		/*
 		 * Until the kernel core dump and va_server library code
 		 * do the right thing with respect to the configured page size,
 		 * try to recognize a fatal inequity between the compiled-in 
 		 * page size and the page size used by the kernel.
 		 */ 
+		
 
 		if ((sp = symbol_search("empty_zero_page")) &&
 		    (spn = next_symbol(NULL, sp)) && 
@@ -205,7 +213,8 @@ ia64_init(int when)
 		else if (symbol_exists("_irq_desc"))
 			ARRAY_LENGTH_INIT(machdep->nr_irqs, irq_desc, 
 				"_irq_desc", NULL, 0);
-		machdep->hz = 1024;
+		if (!machdep->hz)
+			machdep->hz = 1024;
 		ia64_create_memmap();
                 break;
 
@@ -287,11 +296,34 @@ parse_cmdline_arg(void)
 					continue;
 				}
 			}
+		} else if (STRNEQ(arglist[i], "vm=")) {
+			p = arglist[i] + strlen("vm=");
+			if (strlen(p)) {
+				if (STREQ(p, "4l")) {
+					machdep->flags |= VM_4_LEVEL;
+					continue;
+				}
+			}
 		}
 
 		error(WARNING, "ignoring --machdep option: %s\n", arglist[i]);
 	} 
 
+	switch (machdep->flags & (VM_4_LEVEL))
+	{
+		case VM_4_LEVEL:
+			error(NOTE, "using 4-level pagetable\n");
+			c++;
+			break;
+			
+		default:
+			error(WARNING, "Invalid vm= option\n");
+			c++;
+			machdep->flags &= ~(VM_4_LEVEL);
+			break;
+	} 
+
+
 	if (c)
 		fprintf(fp, "\n");
 }
@@ -408,6 +440,8 @@ ia64_dump_machdep_table(ulong arg)
 		fprintf(fp, "%sDEVMEMRD", others++ ? "|" : "");
 	if (machdep->flags & INIT)
 		fprintf(fp, "%sINIT", others++ ? "|" : "");
+	if (machdep->flags & VM_4_LEVEL)
+		fprintf(fp, "%sVM_4_LEVEL", others++ ? "|" : "");
         fprintf(fp, ")\n");
         fprintf(fp, "             kvbase: %lx\n", machdep->kvbase);
 	fprintf(fp, "  identity_map_base: %lx\n", machdep->identity_map_base);
@@ -451,9 +485,11 @@ ia64_dump_machdep_table(ulong arg)
 	fprintf(fp, "    value_to_symbol: generic_machdep_value_to_symbol()\n");
         fprintf(fp, "  line_number_hooks: ia64_line_number_hooks\n");
         fprintf(fp, "      last_pgd_read: %lx\n", machdep->last_pgd_read);
+        fprintf(fp, "      last_pud_read: %lx\n", machdep->last_pud_read);
         fprintf(fp, "      last_pmd_read: %lx\n", machdep->last_pmd_read);
         fprintf(fp, "     last_ptbl_read: %lx\n", machdep->last_ptbl_read);
         fprintf(fp, "                pgd: %lx\n", (ulong)machdep->pgd);
+        fprintf(fp, "                pud: %lx\n", (ulong)machdep->pud);
         fprintf(fp, "                pmd: %lx\n", (ulong)machdep->pmd);
         fprintf(fp, "               ptbl: %lx\n", (ulong)machdep->ptbl);
 	fprintf(fp, "       ptrs_per_pgd: %d\n", machdep->ptrs_per_pgd);
@@ -667,75 +703,152 @@ ia64_processor_speed(void)
 
 	return (machdep->mhz = mhz);
 }
-
-
-/*
- *  Translates a user virtual address to its physical address.  cmd_vtop()
- *  sets the verbose flag so that the pte translation gets displayed; all
- *  other callers quietly accept the translation.
- *
- *  This routine can also take mapped kernel virtual addresses if the -u flag
- *  was passed to cmd_vtop().  If so, it makes the translation using the
- *  swapper_pg_dir, making it irrelevant in this processor's case.
+/* Generic abstraction to translate user or kernel virtual
+ * addresses to physical using a 4 level page table.
  */
 static int
-ia64_uvtop(struct task_context *tc, ulong uvaddr, physaddr_t *paddr, int verbose)
+ia64_vtop_4l(ulong vaddr, physaddr_t *paddr, ulong *pgd, int verbose, int usr)
 {
-	ulong mm;
-	ulong *pgd;
 	ulong *page_dir;
+	ulong *page_upper;
 	ulong *page_middle;
 	ulong *page_table;
 	ulong pgd_pte;
+	ulong pud_pte;
 	ulong pmd_pte;
 	ulong pte;
 	ulong region, offset;
 
-	if (!tc)
-		error(FATAL, "current context invalid\n");
-
-	*paddr = 0;
-       	region = VADDR_REGION(uvaddr);
+	if(usr){
+		region = VADDR_REGION(vaddr);
+		offset = (vaddr >> PGDIR_SHIFT) & ((PTRS_PER_PGD >> 3) - 1);
+		offset |= (region << (PAGESHIFT() - 6));
+		page_dir = pgd + offset;
+	}else{
+		pgd = (ulong *)vt->kernel_pgd[0];
+		page_dir = pgd + ((vaddr >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1));
+	}
 
-	if (IS_KVADDR(uvaddr))
-		return ia64_kvtop(tc, uvaddr, paddr, verbose);
+	if (verbose) 
+		fprintf(fp, "PAGE DIRECTORY: %lx\n", (ulong)pgd);
 
-	if ((mm = task_mm(tc->task, TRUE)))
-        	pgd = ULONG_PTR(tt->mm_struct + OFFSET(mm_struct_pgd));
-	else
-		readmem(tc->mm_struct + OFFSET(mm_struct_pgd), KVADDR, &pgd,
-			sizeof(long), "mm_struct pgd", FAULT_ON_ERROR);
+	FILL_PGD(PAGEBASE(pgd), KVADDR, PAGESIZE());
+	pgd_pte = ULONG(machdep->pgd + PAGEOFFSET(page_dir));
+	
+        if (verbose) 
+                fprintf(fp, "   PGD: %lx => %lx\n", (ulong)page_dir, pgd_pte);
 
+        if (!(pgd_pte))
+		return FALSE;
+	
+	offset = (vaddr >> PUD_SHIFT) & (PTRS_PER_PUD - 1);
+	page_upper = (ulong *)(PTOV(pgd_pte & _PFN_MASK)) + offset; 
+	
+	FILL_PUD(PAGEBASE(page_upper), KVADDR, PAGESIZE());
+	pud_pte = ULONG(machdep->pud + PAGEOFFSET(page_upper));
+        
 	if (verbose) 
+                fprintf(fp, "   PUD: %lx => %lx\n", (ulong)page_upper, pud_pte);
+        
+	if (!(pud_pte))
+		return FALSE;
+
+	offset = (vaddr >> PMD_SHIFT) & (PTRS_PER_PMD - 1);
+	page_middle = (ulong *)(PTOV(pud_pte & _PFN_MASK)) + offset; 
+
+	FILL_PMD(PAGEBASE(page_middle), KVADDR, PAGESIZE());
+	pmd_pte = ULONG(machdep->pmd + PAGEOFFSET(page_middle));
+
+        if (verbose)
+                fprintf(fp, "   PMD: %lx => %lx\n", (ulong)page_middle, pmd_pte);
+
+        if (!(pmd_pte))
+		return FALSE;
+
+        offset = (vaddr >> PAGESHIFT()) & (PTRS_PER_PTE - 1);
+        page_table = (ulong *)(PTOV(pmd_pte & _PFN_MASK)) + offset;
+
+	FILL_PTBL(PAGEBASE(page_table), KVADDR, PAGESIZE());
+	pte = ULONG(machdep->ptbl + PAGEOFFSET(page_table));
+
+        if (verbose)
+                fprintf(fp, "   PTE: %lx => %lx\n", (ulong)page_table, pte);
+
+        if (!(pte & (_PAGE_P))) {
+		if(usr)
+		  *paddr = pte;
+		if (pte && verbose) {
+			fprintf(fp, "\n");
+			ia64_translate_pte(pte, 0, 0);
+		}
+		return FALSE;
+        }
+
+        *paddr = (pte & _PFN_MASK) + PAGEOFFSET(vaddr);
+
+        if (verbose) {
+                fprintf(fp, "  PAGE: %lx\n\n", PAGEBASE(*paddr));
+		ia64_translate_pte(pte, 0, 0);
+	}
+
+	return TRUE;
+
+
+
+}
+
+/* Generic abstraction to translate user or kernel virtual
+ * addresses to physical using a 3 level page table.
+ */
+static int
+ia64_vtop(ulong vaddr, physaddr_t *paddr, ulong *pgd, int verbose, int usr)
+{
+	ulong *page_dir;
+	ulong *page_middle;
+	ulong *page_table;
+	ulong pgd_pte;
+	ulong pmd_pte;
+	ulong pte;
+	ulong region, offset;
+
+	if(usr){
+		region = VADDR_REGION(vaddr);
+		offset = (vaddr >> PGDIR_SHIFT) & ((PTRS_PER_PGD >> 3) - 1);
+		offset |= (region << (PAGESHIFT() - 6));
+		page_dir = pgd + offset;
+	}else{
+		pgd = (ulong *)vt->kernel_pgd[0];
+		page_dir = pgd + ((vaddr >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1));
+	}
+
+	if (verbose)
 		fprintf(fp, "PAGE DIRECTORY: %lx\n", (ulong)pgd);
+	
 
-        offset = (uvaddr >> PGDIR_SHIFT) & ((PTRS_PER_PGD >> 3) - 1);
-        offset |= (region << (PAGESHIFT() - 6));
-        page_dir = pgd + offset;
 
 	FILL_PGD(PAGEBASE(pgd), KVADDR, PAGESIZE());
 	pgd_pte = ULONG(machdep->pgd + PAGEOFFSET(page_dir));
 	
-        if (verbose) {
+        if (verbose) 
                 fprintf(fp, "   PGD: %lx => %lx\n", (ulong)page_dir, pgd_pte);
-        }
+
 
         if (!(pgd_pte))
-                goto no_upage;
+		return FALSE;
 
-	offset = (uvaddr >> PMD_SHIFT) & (PTRS_PER_PMD - 1);
+	offset = (vaddr >> PMD_SHIFT) & (PTRS_PER_PMD - 1);
 	page_middle = (ulong *)(PTOV(pgd_pte & _PFN_MASK)) + offset; 
 
 	FILL_PMD(PAGEBASE(page_middle), KVADDR, PAGESIZE());
 	pmd_pte = ULONG(machdep->pmd + PAGEOFFSET(page_middle));
 
         if (verbose)
-                fprintf(fp, "   PMD: %lx => %lx\n", (ulong)page_middle,pmd_pte);
+                fprintf(fp, "   PMD: %lx => %lx\n", (ulong)page_middle, pmd_pte);
 
         if (!(pmd_pte))
-                goto no_upage;
+		return FALSE;
 
-        offset = (uvaddr >> PAGESHIFT()) & (PTRS_PER_PTE - 1);
+        offset = (vaddr >> PAGESHIFT()) & (PTRS_PER_PTE - 1);
         page_table = (ulong *)(PTOV(pmd_pte & _PFN_MASK)) + offset;
 
 	FILL_PTBL(PAGEBASE(page_table), KVADDR, PAGESIZE());
@@ -745,15 +858,16 @@ ia64_uvtop(struct task_context *tc, ulon
                 fprintf(fp, "   PTE: %lx => %lx\n", (ulong)page_table, pte);
 
         if (!(pte & (_PAGE_P))) {
-		*paddr = pte;
+		if(usr)
+		  *paddr = pte;
 		if (pte && verbose) {
 			fprintf(fp, "\n");
 			ia64_translate_pte(pte, 0, 0);
 		}
-                goto no_upage;
+		return FALSE;
         }
 
-        *paddr = (pte & _PFN_MASK) + PAGEOFFSET(uvaddr);
+        *paddr = (pte & _PFN_MASK) + PAGEOFFSET(vaddr);
 
         if (verbose) {
                 fprintf(fp, "  PAGE: %lx\n\n", PAGEBASE(*paddr));
@@ -762,9 +876,52 @@ ia64_uvtop(struct task_context *tc, ulon
 
 	return TRUE;
 
-no_upage:
+}
 
-	return FALSE;
+
+/*
+ *  Translates a user virtual address to its physical address.  cmd_vtop()
+ *  sets the verbose flag so that the pte translation gets displayed; all
+ *  other callers quietly accept the translation.
+ *
+ *  This routine can also take mapped kernel virtual addresses if the -u flag
+ *  was passed to cmd_vtop().  If so, it makes the translation using the
+ *  swapper_pg_dir, making it irrelevant in this processor's case.
+ */
+static int
+ia64_uvtop(struct task_context *tc, ulong uvaddr, physaddr_t *paddr, int verbose)
+{
+	ulong mm;
+	ulong *pgd;
+/**
+	ulong *page_dir;
+	ulong *page_middle;
+	ulong *page_table;
+	ulong pgd_pte;
+	ulong pmd_pte;
+	ulong pte;
+	ulong offset;
+**/
+
+	if (!tc)
+		error(FATAL, "current context invalid\n");
+
+	*paddr = 0;
+
+	if (IS_KVADDR(uvaddr))
+		return ia64_kvtop(tc, uvaddr, paddr, verbose);
+
+	if ((mm = task_mm(tc->task, TRUE)))
+        	pgd = ULONG_PTR(tt->mm_struct + OFFSET(mm_struct_pgd));
+	else
+		readmem(tc->mm_struct + OFFSET(mm_struct_pgd), KVADDR, &pgd,
+			sizeof(long), "mm_struct pgd", FAULT_ON_ERROR);
+
+	if (machdep->flags & VM_4_LEVEL)
+		return ia64_vtop_4l(uvaddr, paddr, pgd, verbose, 1);
+	else
+		return ia64_vtop(uvaddr, paddr, pgd, verbose, 1);
+	
 }
 
 
@@ -777,6 +934,7 @@ static int
 ia64_kvtop(struct task_context *tc, ulong kvaddr, physaddr_t *paddr, int verbose)
 {
         ulong *pgd;
+/**
         ulong *page_dir;
         ulong *page_middle;
         ulong *page_table;
@@ -784,6 +942,7 @@ ia64_kvtop(struct task_context *tc, ulon
         ulong pmd_pte;
         ulong pte;
 	ulong offset;
+**/
 
         if (!IS_KVADDR(kvaddr))
                 return FALSE;
@@ -818,64 +977,11 @@ ia64_kvtop(struct task_context *tc, ulon
 
         pgd = (ulong *)vt->kernel_pgd[0];
 
-        if (verbose) {
-                fprintf(fp, "PAGE DIRECTORY: %lx\n", (ulong)pgd);
-	}
-
-	page_dir = pgd + ((kvaddr >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1)); 
-
-        FILL_PGD(PAGEBASE(pgd), KVADDR, PAGESIZE());
-        pgd_pte = ULONG(machdep->pgd + PAGEOFFSET(page_dir));
-
-        if (verbose) {
-                fprintf(fp, "   PGD: %lx => %lx\n", (ulong)page_dir, pgd_pte);
-	}
-
-        if (!(pgd_pte))
-                goto no_kpage;
-
-	offset = (kvaddr >> PMD_SHIFT) & (PTRS_PER_PMD - 1);
-	page_middle = (ulong *)(PTOV(pgd_pte & _PFN_MASK)) + offset; 
-
-        FILL_PMD(PAGEBASE(page_middle), KVADDR, PAGESIZE());
-        pmd_pte = ULONG(machdep->pmd + PAGEOFFSET(page_middle));
-
-        if (verbose)
-                fprintf(fp, "   PMD: %lx => %lx\n", (ulong)page_middle, 
-			pmd_pte);
-
-        if (!(pmd_pte))
-                goto no_kpage;
-
-        offset = (kvaddr >> PAGESHIFT()) & (PTRS_PER_PTE - 1);
-        page_table = (ulong *)(PTOV(pmd_pte & _PFN_MASK)) + offset;
-
-        FILL_PTBL(PAGEBASE(page_table), KVADDR, PAGESIZE());
-        pte = ULONG(machdep->ptbl + PAGEOFFSET(page_table));
-
-        if (verbose)
-                fprintf(fp, "   PTE: %lx => %lx\n", (ulong)page_table, pte);
-
-        if (!(pte & (_PAGE_P))) {
-		if (pte && verbose) {
-			fprintf(fp, "\n");
-			ia64_translate_pte(pte, 0, 0);
-		}
-                goto no_kpage;
-        }
-
-        *paddr = (pte & _PFN_MASK) + PAGEOFFSET(kvaddr);
-
-        if (verbose) {
-                fprintf(fp, "  PAGE: %lx\n\n", PAGEBASE(*paddr));
-		ia64_translate_pte(pte, 0, 0);
-	}
-
-	return TRUE;
-
-no_kpage:
+	if (machdep->flags & VM_4_LEVEL)
+		return ia64_vtop_4l(kvaddr, paddr, pgd, verbose, 0);
+	else
+		return ia64_vtop(kvaddr, paddr, pgd, verbose, 0);
 
-	return FALSE;
 }
 
 /*
@@ -2394,9 +2500,10 @@ ia64_create_memmap(void)
 
 	if ((ms->mem_limit && (efi_memmap >= ms->mem_limit)) ||
             !readmem(PTOV(efi_memmap), KVADDR, memmap,
-	    ms->efi_memmap_size, "efi_mmap contents", RETURN_ON_ERROR)) {
+	    ms->efi_memmap_size, "efi_mmap contents", 
+	    QUIET|RETURN_ON_ERROR)) {
 		error(WARNING, "cannot read efi_mmap: " 
-			"memory verification will not be performed\n");
+			"EFI memory verification will not be performed\n\n");
 		free(memmap);
 		return;
 	}
diff -purN crash-4.0-2.33/kernel.c crash-4.0-3.1/kernel.c
--- crash-4.0-2.33/kernel.c	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/kernel.c	2006-08-04 17:24:00.000000000 +0200
@@ -43,6 +43,7 @@ static void verify_namelist(void);
 static char *debug_kernel_version(char *);
 static int restore_stack(struct bt_info *);
 static ulong __xen_m2p(ulonglong, ulong);
+static void read_in_kernel_config_err(int, char *);
 
 
 /*
@@ -51,9 +52,10 @@ static ulong __xen_m2p(ulonglong, ulong)
 void
 kernel_init(int when)
 {
-	int i;
+	int i, c;
 	char *p1, *p2, buf[BUFSIZE];
 	struct syment *sp1, *sp2;
+	char *rqstruct;
 
 	if (pc->flags & KERNEL_DEBUG_QUERY)
 		return;
@@ -157,7 +159,15 @@ kernel_init(int when)
 				&kt->__per_cpu_offset[0]); 
 			kt->flags |= PER_CPU_OFF;
 		}
-		MEMBER_OFFSET_INIT(runqueue_cpu, "runqueue", "cpu");
+		if (STRUCT_EXISTS("runqueue"))
+			rqstruct = "runqueue";
+		else if (STRUCT_EXISTS("rq"))
+			rqstruct = "rq";
+
+		MEMBER_OFFSET_INIT(runqueue_cpu, rqstruct, "cpu");
+		/*
+		 * 'cpu' does not exist in 'struct rq'.
+		 */
 		if (VALID_MEMBER(runqueue_cpu) &&
 		    (get_array_length("runqueue.cpu", NULL, 0) > 0)) {
 			MEMBER_OFFSET_INIT(cpu_s_curr, "cpu_s", "curr");
@@ -182,17 +192,17 @@ kernel_init(int when)
 	     "runq_siblings: %d: __cpu_idx and __rq_idx arrays don't exist?\n",
 					kt->runq_siblings);
 		} else {
-			MEMBER_OFFSET_INIT(runqueue_idle, "runqueue", "idle");
-			MEMBER_OFFSET_INIT(runqueue_curr, "runqueue", "curr");
+			MEMBER_OFFSET_INIT(runqueue_idle, rqstruct, "idle");
+			MEMBER_OFFSET_INIT(runqueue_curr, rqstruct, "curr");
 			ASSIGN_OFFSET(runqueue_cpu) = INVALID_OFFSET;
 		}
-		MEMBER_OFFSET_INIT(runqueue_active, "runqueue", "active");
-		MEMBER_OFFSET_INIT(runqueue_expired, "runqueue", "expired");
-		MEMBER_OFFSET_INIT(runqueue_arrays, "runqueue", "arrays");
+		MEMBER_OFFSET_INIT(runqueue_active, rqstruct, "active");
+		MEMBER_OFFSET_INIT(runqueue_expired, rqstruct, "expired");
+		MEMBER_OFFSET_INIT(runqueue_arrays, rqstruct, "arrays");
 		MEMBER_OFFSET_INIT(prio_array_queue, "prio_array", "queue");
                 MEMBER_OFFSET_INIT(prio_array_nr_active, "prio_array",
                         "nr_active");
-		STRUCT_SIZE_INIT(runqueue, "runqueue"); 
+		STRUCT_SIZE_INIT(runqueue, rqstruct); 
 		STRUCT_SIZE_INIT(prio_array, "prio_array"); 
 
                /*
@@ -229,10 +239,16 @@ kernel_init(int when)
 		    (kt->flags & PER_CPU_OFF))
 			kt->cpus = machdep->get_smp_cpus();
 
+		if (kt->cpus_override && (c = atoi(kt->cpus_override))) {
+			error(WARNING, "forcing cpu count to: %d\n\n", c);
+			kt->cpus = c;
+		}
+
 		if (kt->cpus > NR_CPUS) {
 			error(WARNING, 
-       "calculated number of cpus (%d) greater than compiled-in NR_CPUS (%d)\n",
-				kt->cpus, NR_CPUS);
+       "%s number of cpus (%d) greater than compiled-in NR_CPUS (%d)\n",
+				kt->cpus_override && atoi(kt->cpus_override) ? 
+				"configured" : "calculated", kt->cpus, NR_CPUS);
 			error(FATAL, "recompile crash with larger NR_CPUS\n");
 		}
 
@@ -2903,6 +2919,8 @@ cmd_sys(void)
         do {
                 if (sflag)
                         dump_sys_call_table(args[optind], cnt++);
+		else if (STREQ(args[optind], "config"))
+			read_in_kernel_config(IKCFG_READ);
                 else
                         cmd_usage(args[optind], COMPLETE_HELP);
                 optind++;
@@ -3362,6 +3380,8 @@ dump_kernel_table(int verbose)
 		fprintf(fp, "%sUSE_OLD_BT", others++ ? "|" : "");
 	if (kt->flags & ARCH_XEN)
 		fprintf(fp, "%sARCH_XEN", others++ ? "|" : "");
+	if (kt->flags & NO_IKCONFIG)
+		fprintf(fp, "%sNO_IKCONFIG", others++ ? "|" : "");
 	fprintf(fp, ")\n");
         fprintf(fp, "         stext: %lx\n", kt->stext);
         fprintf(fp, "         etext: %lx\n", kt->etext);
@@ -3371,6 +3391,7 @@ dump_kernel_table(int verbose)
         fprintf(fp, "      init_end: %lx\n", kt->init_end);
         fprintf(fp, "           end: %lx\n", kt->end);
         fprintf(fp, "          cpus: %d\n", kt->cpus);
+        fprintf(fp, " cpus_override: %s\n", kt->cpus_override);
         fprintf(fp, "       NR_CPUS: %d (compiled-in to this version of %s)\n",
 		NR_CPUS, pc->program_name); 
 	fprintf(fp, "kernel_NR_CPUS: %d\n", kt->kernel_NR_CPUS);
@@ -4890,19 +4911,39 @@ clear_machdep_cache(void)
 }
 
 /*
- *  For kernels containing cpu_online_map, count the bits.
+ *  For kernels containing at least the cpu_online_map, use it
+ *  to determine the cpu count.
  */
 int
 get_cpus_online()
 {
-	ulong cpu_online_map;
+	int i, len, online;
+	struct gnu_request req;
+	char *buf;
+	ulong *maskptr;
 
 	if (!symbol_exists("cpu_online_map")) 
 		return 0;
 
-	get_symbol_data("cpu_online_map", sizeof(ulong), &cpu_online_map);
+	len = get_symbol_type("cpu_online_map", NULL, &req) == TYPE_CODE_UNDEF ?
+		sizeof(ulong) : req.length;
+	buf = GETBUF(len);
 
-	return count_bits_long(cpu_online_map);
+	online = 0;
+
+        if (readmem(symbol_value("cpu_online_map"), KVADDR, buf, len,
+            "cpu_online_map", RETURN_ON_ERROR)) {
+
+		maskptr = (ulong *)buf;
+		for (i = 0; i < (len/sizeof(ulong)); i++, maskptr++)
+			online += count_bits_long(*maskptr);
+
+		FREEBUF(buf);
+		if (CRASHDEBUG(1))
+			error(INFO, "get_cpus_online: online: %d\n", online);
+	}
+
+	return online;
 }
 
 /*
@@ -5022,3 +5063,254 @@ __xen_m2p(ulonglong machine, ulong mfn)
 
 	return (XEN_MFN_NOT_FOUND);
 }
+
+
+/*
+ *  Read the relevant IKCONFIG (In Kernel Config) data if available.
+ */
+
+static char *ikconfig[] = {
+        "CONFIG_NR_CPUS",
+        "CONFIG_PGTABLE_4",
+        "CONFIG_HZ",
+        NULL,
+};
+
+void
+read_in_kernel_config(int command)
+{
+	struct syment *sp;
+	int ii, jj, ret, end, found=0;
+	unsigned long size, bufsz;
+	char *pos, *ln, *buf, *head, *tail, *val, *uncomp;
+	char line[512];
+	z_stream stream;
+
+	if ((kt->flags & NO_IKCONFIG) && !(pc->flags & RUNTIME))
+		return;
+
+	if ((sp = symbol_search("kernel_config_data")) == NULL) {
+		if (command == IKCFG_READ)
+			error(FATAL, 
+			    "kernel_config_data does not exist in this kernel\n");
+		return;
+	}
+	
+	/* We don't know how large IKCONFIG is, so we start with 
+	 * 32k, if we can't find MAGIC_END assume we didn't read 
+	 * enough, double it and try again.
+	 */
+	ii = 32;
+
+again:
+	size = ii * 1024;
+
+	if ((buf = (char *)malloc(size)) == NULL) {
+		error(WARNING, "cannot malloc IKCONFIG input buffer\n");
+		return;
+	}
+	
+        if (!readmem(sp->value, KVADDR, buf, size,
+            "kernel_config_data", RETURN_ON_ERROR)) {
+		error(WARNING, "cannot read kernel_config_data\n");
+		goto out2;
+	}
+		
+	/* Find the start */
+	if (strstr(buf, MAGIC_START))
+		head = buf + MAGIC_SIZE + 10; /* skip past MAGIC_START and gzip header */
+	else {
+		error(WARNING, "could not find MAGIC_START!\n");
+		goto out2;
+	}
+
+	tail = head;
+
+	end = strlen(MAGIC_END);
+
+	/* Find the end*/
+	while (tail < (buf + (size - 1))) {
+		
+		if (strncmp(tail, MAGIC_END, end)==0) {
+			found = 1;
+			break;
+		}
+		tail++;
+	}
+
+	if (found) {
+		bufsz = tail - head;
+		size = 10 * bufsz;
+		if ((uncomp = (char *)malloc(size)) == NULL) {
+			error(WARNING, "cannot malloc IKCONFIG output buffer\n");
+			goto out2;
+		}
+	} else {
+		if (ii > 512) {
+			error(WARNING, "could not find MAGIC_END!\n");
+			goto out2;
+		} else {
+			free(buf);
+			ii *= 2;
+			goto again;
+		}
+	}
+
+
+	/* initialize zlib */
+	stream.next_in = (Bytef *)head;
+	stream.avail_in = (uInt)bufsz;
+
+	stream.next_out = uncomp;
+	stream.avail_out = (uInt)size;
+
+	stream.zalloc = NULL;
+	stream.zfree = NULL;
+	stream.opaque = NULL;
+
+	ret = inflateInit2(&stream, -MAX_WBITS);
+	if (ret != Z_OK) {
+		read_in_kernel_config_err(ret, "initialize");
+		goto out1;
+	}
+
+	ret = inflate(&stream, Z_FINISH);
+
+	if (ret != Z_STREAM_END) {
+		inflateEnd(&stream);
+		if (ret == Z_NEED_DICT || 
+		   (ret == Z_BUF_ERROR && stream.avail_in == 0)) {
+			read_in_kernel_config_err(Z_DATA_ERROR, "uncompress");
+			goto out1;
+		}
+		read_in_kernel_config_err(ret, "uncompress");
+		goto out1;
+	}
+	size = stream.total_out;
+
+	ret = inflateEnd(&stream);
+
+	pos = uncomp;
+
+	do {
+		ret = sscanf(pos, "%511[^\n]\n%n", line, &ii);
+		if (ret > 0) {
+			if ((command == IKCFG_READ) || CRASHDEBUG(8))
+				fprintf(fp, "%s\n", line);
+
+			pos += ii;
+
+			ln = line;
+				
+			/* skip leading whitespace */
+			while (whitespace(*ln))
+				ln++;
+
+			/* skip comments */
+			if (*ln == '#')
+				continue;
+
+			/* Find '=' */
+			if ((head = strchr(ln, '=')) != NULL) {
+				*head = '\0';
+				val = head + 1;
+
+				head--;
+
+				/* skip trailing whitespace */
+				while (whitespace(*head)) {
+					*head = '\0';
+					head--;
+				}
+
+				/* skip whitespace */
+				while (whitespace(*val))
+					val++;
+
+			} else /* Bad line, skip it */
+				continue;
+
+			if (command != IKCFG_INIT)
+				continue;
+
+			for (jj = 0; ikconfig[jj]; jj++) {
+				 if (STREQ(ln, ikconfig[jj])) {
+
+					if (STREQ(ln, "CONFIG_NR_CPUS")) {
+						kt->kernel_NR_CPUS = atoi(val);
+						if (CRASHDEBUG(1)) 
+							error(INFO, 
+							    "CONFIG_NR_CPUS: %d\n",
+								kt->kernel_NR_CPUS);
+
+					} else if (STREQ(ln, "CONFIG_PGTABLE_4")) {
+						machdep->flags |= VM_4_LEVEL;
+						if (CRASHDEBUG(1))
+							error(INFO, "CONFIG_PGTABLE_4\n");
+
+					} else if (STREQ(ln, "CONFIG_HZ")) {
+						machdep->hz = atoi(val);
+						if (CRASHDEBUG(1))
+							error(INFO, 
+							    "CONFIG_HZ: %d\n",
+								machdep->hz);
+					}
+				}
+			}
+		}
+	} while (ret > 0);
+
+out1:
+	free(uncomp);
+out2:
+	free(buf);
+
+	return;
+}
+
+static void
+read_in_kernel_config_err(int e, char *msg)
+{
+	error(WARNING, "zlib could not %s\n", msg);
+	switch (e) {
+		case Z_OK:
+			fprintf(fp, "Z_OK\n");
+			break;
+
+		case Z_STREAM_END:
+			fprintf(fp, "Z_STREAM_END\n");
+			break;
+
+		case Z_NEED_DICT:
+			fprintf(fp, "Z_NEED_DICT\n");
+			break;
+		
+		case Z_ERRNO:
+			fprintf(fp, "Z_ERNO\n");
+			break;
+
+		case Z_STREAM_ERROR:
+			fprintf(fp, "Z_STREAM\n");
+			break;
+
+		case Z_DATA_ERROR: 
+			fprintf(fp, "Z_DATA_ERROR\n");
+			break;
+
+		case Z_MEM_ERROR: /* out of memory */
+			fprintf(fp, "Z_MEM_ERROR\n");
+			break;
+
+		case Z_BUF_ERROR: /* not enough room in output buf */
+			fprintf(fp, "Z_BUF_ERROR\n");
+			break;
+		
+		case Z_VERSION_ERROR:
+			fprintf(fp, "Z_VERSION_ERROR\n");
+			break;
+
+		default: 
+			fprintf(fp, "UNKNOWN ERROR: %d\n", e);
+			break;
+	}
+}
diff -purN crash-4.0-2.33/main.c crash-4.0-3.1/main.c
--- crash-4.0-2.33/main.c	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/main.c	2006-08-04 17:24:00.000000000 +0200
@@ -42,6 +42,8 @@ static struct option long_options[] = {
 	{"version", 0, 0, 0},
 	{"buildinfo", 0, 0, 0},
 	{"shadow_page_tables", 0, 0, 0},
+        {"cpus", 1, 0, 0},
+        {"no_ikconfig", 0, 0, 0},
         {0, 0, 0, 0}
 };
 
@@ -79,6 +81,10 @@ main(int argc, char **argv)
 				kt->flags |= NO_MODULE_ACCESS;
 
 		        if (STREQ(long_options[option_index].name, 
+			    "no_ikconfig")) 
+				kt->flags |= NO_IKCONFIG;
+
+		        if (STREQ(long_options[option_index].name, 
 			    "no_namelist_gzip")) 
 				pc->flags |= NAMELIST_NO_GZIP;
 
@@ -133,6 +139,9 @@ main(int argc, char **argv)
 			    "shadow_page_tables")) 
 				kt->xen_flags |= SHADOW_PAGE_TABLES;
 
+		        if (STREQ(long_options[option_index].name, "cpus")) 
+				kt->cpus_override = optarg;
+
 			break;
 
 		case 'f':
@@ -178,7 +187,7 @@ main(int argc, char **argv)
 		case 's':
 			pc->flags |= SILENT;
 			pc->flags &= ~SCROLL;
-			pc->scroll_command = SCROLL_NONE;
+//   			pc->scroll_command = SCROLL_NONE;   (why?)
 			break;
 
 		case 'L':
@@ -371,8 +380,7 @@ main(int argc, char **argv)
 	machdep_init(PRE_SYMTAB);
         symtab_init();
 	machdep_init(PRE_GDB);
-//	kernel_init(PRE_GDB);
-//	verify_version();
+	read_in_kernel_config(IKCFG_INIT);
         datatype_init();
 
 	/*
diff -purN crash-4.0-2.33/memory.c crash-4.0-3.1/memory.c
--- crash-4.0-2.33/memory.c	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/memory.c	2006-08-04 17:24:00.000000000 +0200
@@ -437,8 +437,11 @@ vm_init(void)
 			"kmem_slab_s", "s_magic");
 	}
 
-	kt->kernel_NR_CPUS = ARRAY_LENGTH(kmem_cache_s_cpudata) ?
-		ARRAY_LENGTH(kmem_cache_s_cpudata) : ARRAY_LENGTH(kmem_cache_s_array);
+	if (!kt->kernel_NR_CPUS) {
+		kt->kernel_NR_CPUS = ARRAY_LENGTH(kmem_cache_s_cpudata) ?
+			ARRAY_LENGTH(kmem_cache_s_cpudata) : 
+			ARRAY_LENGTH(kmem_cache_s_array);
+	}
 		
         if (kt->kernel_NR_CPUS > NR_CPUS) {
 		error(WARNING, 
diff -purN crash-4.0-2.33/ppc.c crash-4.0-3.1/ppc.c
--- crash-4.0-2.33/ppc.c	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/ppc.c	2006-08-04 17:24:00.000000000 +0200
@@ -135,9 +135,11 @@ ppc_init(int when)
 				"irq_desc", NULL, 0);
 		else
 			machdep->nr_irqs = 0;
-		machdep->hz = HZ;
-		if (THIS_KERNEL_VERSION >= LINUX(2,6,0))
-			machdep->hz = 1000;
+		if (!machdep->hz) {
+			machdep->hz = HZ;
+			if (THIS_KERNEL_VERSION >= LINUX(2,6,0))
+				machdep->hz = 1000;
+		}
 		machdep->section_size_bits = _SECTION_SIZE_BITS;
 		machdep->max_physmem_bits = _MAX_PHYSMEM_BITS;
 		break;
diff -purN crash-4.0-2.33/ppc64.c crash-4.0-3.1/ppc64.c
--- crash-4.0-2.33/ppc64.c	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/ppc64.c	2006-08-04 17:24:00.000000000 +0200
@@ -237,9 +237,11 @@ ppc64_init(int when)
 			 */
 			BZERO(&machdep->machspec->hwintrstack,
 				NR_CPUS*sizeof(ulong));
-		machdep->hz = HZ;
-		if (THIS_KERNEL_VERSION >= LINUX(2,6,0))
-			machdep->hz = 1000;
+		if (!machdep->hz) {
+			machdep->hz = HZ;
+			if (THIS_KERNEL_VERSION >= LINUX(2,6,0))
+				machdep->hz = 1000;
+		}
 		/*
 		 * IRQ stacks are introduced in 2.6 and also configurable.
 		 */
diff -purN crash-4.0-2.33/s390.c crash-4.0-3.1/s390.c
--- crash-4.0-2.33/s390.c	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/s390.c	2006-08-04 17:24:00.000000000 +0200
@@ -158,7 +158,8 @@ s390_init(int when)
 		machdep->nr_irqs = 0;  /* TBD */
 		machdep->vmalloc_start = s390_vmalloc_start;
 		machdep->dump_irq = s390_dump_irq;
-		machdep->hz = HZ;
+		if (!machdep->hz)
+			machdep->hz = HZ;
 		break;
 
 	case POST_INIT:
diff -purN crash-4.0-2.33/s390x.c crash-4.0-3.1/s390x.c
--- crash-4.0-2.33/s390x.c	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/s390x.c	2006-08-04 17:24:00.000000000 +0200
@@ -173,7 +173,8 @@ s390x_init(int when)
 		machdep->nr_irqs = 0;  /* TBD */
 		machdep->vmalloc_start = s390x_vmalloc_start;
 		machdep->dump_irq = s390x_dump_irq;
-		machdep->hz = HZ;
+		if (!machdep->hz)
+			machdep->hz = HZ;
 		break;
 
 	case POST_INIT:
diff -purN crash-4.0-2.33/symbols.c crash-4.0-3.1/symbols.c
--- crash-4.0-2.33/symbols.c	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/symbols.c	2006-08-04 17:24:00.000000000 +0200
@@ -1159,7 +1159,7 @@ store_module_symbols_v2(ulong total, int
 				mod_name);
                 	strncpy(lm->mod_name, mod_name, MAX_MOD_NAME-1);
 		}
-		if (CRASHDEBUG(1))
+		if (CRASHDEBUG(3))
 			fprintf(fp, 
 			    "%lx (%lx): %s syms: %d gplsyms: %d ksyms: %ld\n", 
 				mod, lm->mod_base, lm->mod_name, nsyms, 
diff -purN crash-4.0-2.33/x86.c crash-4.0-3.1/x86.c
--- crash-4.0-2.33/x86.c	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/x86.c	2006-08-04 17:24:00.000000000 +0200
@@ -1775,9 +1775,11 @@ x86_init(int when)
 				"irq_desc", NULL, 0);
 		else
 			machdep->nr_irqs = 224;  /* NR_IRQS */
-		machdep->hz = HZ;
-		if (THIS_KERNEL_VERSION >= LINUX(2,6,0))
-			machdep->hz = 1000;
+		if (!machdep->hz) {
+			machdep->hz = HZ;
+			if (THIS_KERNEL_VERSION >= LINUX(2,6,0))
+				machdep->hz = 1000;
+		}
 
 		if (machdep->flags & PAE){
 			machdep->section_size_bits = _SECTION_SIZE_BITS_PAE;
diff -purN crash-4.0-2.33/x86_64.c crash-4.0-3.1/x86_64.c
--- crash-4.0-2.33/x86_64.c	2006-07-13 20:51:50.000000000 +0200
+++ crash-4.0-3.1/x86_64.c	2006-08-04 17:24:00.000000000 +0200
@@ -238,9 +238,11 @@ x86_64_init(int when)
                         machdep->nr_irqs = 224;  /* NR_IRQS (at least) */
 		machdep->vmalloc_start = x86_64_vmalloc_start;
 		machdep->dump_irq = x86_64_dump_irq;
-		machdep->hz = HZ;
-		if (THIS_KERNEL_VERSION >= LINUX(2,6,0))
-			machdep->hz = 1000;
+		if (!machdep->hz) {
+			machdep->hz = HZ;
+			if (THIS_KERNEL_VERSION >= LINUX(2,6,0))
+				machdep->hz = 1000;
+		}
 		machdep->section_size_bits = _SECTION_SIZE_BITS;
 		machdep->max_physmem_bits = _MAX_PHYSMEM_BITS;
                 if (XEN()) {

Places

File crash-4.0-2.33-3.1.patch of Package crash (Revision c1bc67168c997b363420d83149e8c6f5)

Places