From b425fe7498c67e7c3236dfd9003447438d0f23b9 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 12 Mar 2009 12:40:06 +0000 Subject: [PATCH] --- yaml --- r: 138735 b: refs/heads/master c: dc9dd5cc854cde110d2421f3a11fec7597e059c1 h: refs/heads/master i: 138733: bc20a45dc650d6d7aaa89a54f9e0ccaec03eacc9 138731: f3380f5f006102af6d415e39561391e42417da6b 138727: cf6f0846c47e9ada9461189a4ba0ddeaa1437032 138719: 740be6873518f8b0a0cf55b69504eb84cd53a3d0 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/init.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b48fafafde4a..8d18443287f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13c6c53282d99c82e79b02477efd2c1e30a991ef +refs/heads/master: dc9dd5cc854cde110d2421f3a11fec7597e059c1 diff --git a/trunk/arch/x86/mm/init.c b/trunk/arch/x86/mm/init.c index 15219e0d1243..fd3da1dda1c9 100644 --- a/trunk/arch/x86/mm/init.c +++ b/trunk/arch/x86/mm/init.c @@ -94,9 +94,9 @@ struct map_range { #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, - unsigned long page_size_mask) +static int __meminit save_mr(struct map_range *mr, int nr_range, + unsigned long start_pfn, unsigned long end_pfn, + unsigned long page_size_mask) { if (start_pfn < end_pfn) { if (nr_range >= NR_RANGE_MR)