x86: ifdef 32-bit and 64-bit setup in init_memory_mapping() (01ced9ec) · Commits · 戴 / test

Impact: cleanup To reduce the diff between the 32-bit and 64-bit versions of init_memory_mapping(), ifdef configuration specific setup code in the function. Signed-off-by:

Pekka Enberg <penberg@cs.helsinki.fi> Cc: Yinghai Lu <yinghai@kernel.org> LKML-Reference: <1236257708-27269-10-git-send-email-penberg@cs.helsinki.fi> Signed-off-by:

Ingo Molnar <mingo@elte.hu>

arch/x86/mm/init_32.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1054,10 +1054,16 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
		mr[i].page_size_mask);
		#endif

		#ifdef CONFIG_X86_32
		early_ioremap_page_table_range_init();

		load_cr3(swapper_pg_dir);
		#endif

		#ifdef CONFIG_X86_64
		if (!after_bootmem)
		mmu_cr4_features = read_cr4();
		#endif
		__flush_tlb_all();

		if (!after_bootmem && table_end > table_start)

arch/x86/mm/init_64.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -832,8 +832,16 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
		mr[i].page_size_mask);
		#endif

		#ifdef CONFIG_X86_32
		early_ioremap_page_table_range_init();

		load_cr3(swapper_pg_dir);
		#endif

		#ifdef CONFIG_X86_64
		if (!after_bootmem)
		mmu_cr4_features = read_cr4();
		#endif
		__flush_tlb_all();

		if (!after_bootmem && table_end > table_start)

Admin message