Commit 4e50e62c authored by Jan Beulich's avatar Jan Beulich Committed by Thomas Gleixner
Browse files

x86: eliminate duplicate consistency checks in init_32.c 



Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 6a1673ae

arch/x86/mm/init_32.c

+0 −13
Original line number Diff line number Diff line
@@ -571,17 +571,6 @@ void __init mem_init(void) 
#endif

	bad_ppro = ppro_with_ram_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

	/* this will put all low memory onto the freelists */

	totalram_pages += free_all_bootmem();
@@ -614,7 +603,6 @@ void __init mem_init(void) 
		(unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))

	       );



#if 1 /* double-sanity-check paranoia */

	printk(KERN_INFO "virtual kernel memory layout:\n"

		"    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"

#ifdef CONFIG_HIGHMEM
@@ -655,7 +643,6 @@ void __init mem_init(void) 
#endif

	BUG_ON(VMALLOC_START				> VMALLOC_END);

	BUG_ON((unsigned long)high_memory		> VMALLOC_START);

#endif /* double-sanity-check paranoia */



	if (boot_cpu_data.wp_works_ok < 0)

		test_wp_bit();