x86: ifdef 32-bit and 64-bit NR_RANGE_MR for save_mr() unification (b47e3418) · Commits · 戴 / test

Impact: cleanup As a trivial preparation for moving common code to arc/x86/mm/init.c, ifdef the 32-bit and 64-bit versions of NR_RANGE_MR. Signed-off-by:

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

Ingo Molnar <mingo@elte.hu>

arch/x86/mm/init_32.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -900,7 +900,11 @@ struct map_range {
		unsigned page_size_mask;
		};

		#ifdef CONFIG_X86_32
		#define NR_RANGE_MR 3
		#else /* CONFIG_X86_64 */
		#define NR_RANGE_MR 5
		#endif

		static int save_mr(struct map_range *mr, int nr_range,
		unsigned long start_pfn, unsigned long end_pfn,

arch/x86/mm/init_64.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -660,7 +660,11 @@ struct map_range {
		unsigned page_size_mask;
		};

		#ifdef CONFIG_X86_32
		#define NR_RANGE_MR 3
		#else /* CONFIG_X86_64 */
		#define NR_RANGE_MR 5
		#endif

		static int save_mr(struct map_range *mr, int nr_range,
		unsigned long start_pfn, unsigned long end_pfn,

Admin message