patch-2.4.26 linux-2.4.26/arch/i386/mm/init.c

• Lines: 17
• Date: 2004-04-14 06:05:25.000000000 -0700
• Orig file: linux-2.4.25/arch/i386/mm/init.c
• Orig date: 2003-06-13 07:51:29.000000000 -0700

diff -urN linux-2.4.25/arch/i386/mm/init.c linux-2.4.26/arch/i386/mm/init.c
@@ -510,7 +510,15 @@
 
 	if (!mem_map)
 		BUG();
-	
+#ifdef CONFIG_HIGHMEM
+	/* check that fixmap and pkmap do not overlap */
+	if (PKMAP_BASE+LAST_PKMAP*PAGE_SIZE >= FIXADDR_START) {
+		printk(KERN_ERR "fixmap and kmap areas overlap - this will crash\n");
+		printk(KERN_ERR "pkstart: %lxh pkend: %lxh fixstart %lxh\n",
+				PKMAP_BASE, PKMAP_BASE+LAST_PKMAP*PAGE_SIZE, FIXADDR_START);
+		BUG();
+	}
+#endif
 	set_max_mapnr_init();
 
 	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);