From 8ee2425e6d5d7737a13decfd322fb700d1ea7142 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Thu, 5 Mar 2009 14:55:03 +0200 Subject: [PATCH] --- yaml --- r: 138675 b: refs/heads/master c: b47e3418c52b26f6143fc696326ae52a21324551 h: refs/heads/master i: 138673: cc56cd2f7e06f5f26708a4cfb9c5dbc5c69e50d0 138671: 379332e3010106148822a03cf2e4b8cc6ee67813 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/init_32.c | 4 ++++ trunk/arch/x86/mm/init_64.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2e21d4efdbea..27d114816880 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c338d6f60fc29dfc74bd82b91526ef43ba992bab +refs/heads/master: b47e3418c52b26f6143fc696326ae52a21324551 diff --git a/trunk/arch/x86/mm/init_32.c b/trunk/arch/x86/mm/init_32.c index 34760e483972..f59e9b851637 100644 --- a/trunk/arch/x86/mm/init_32.c +++ b/trunk/arch/x86/mm/init_32.c @@ -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, diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c index d99bc6ac4884..d101990e4635 100644 --- a/trunk/arch/x86/mm/init_64.c +++ b/trunk/arch/x86/mm/init_64.c @@ -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,