From c38705071a510b275ec0270c842d2f39c47b9f0f Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 18 Jun 2012 11:30:20 +0100 Subject: [PATCH] --- yaml --- r: 312407 b: refs/heads/master c: 0d26d1d873a302828e064737746c53a2689e6c0f h: refs/heads/master i: 312405: a3e1d4d0a28d1dd7ba057f153aac360ad6daba3c 312403: f9bc7fdb47477937c32a1474d2e69134b570cc6a 312399: 754be7fd32b0f4400ceae3fe8f7cde36832ca003 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 344bb7dee335..5c9db302ca08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1b6fc55da40bc17e20795901cb786e3619f9be9 +refs/heads/master: 0d26d1d873a302828e064737746c53a2689e6c0f diff --git a/trunk/arch/x86/mm/init.c b/trunk/arch/x86/mm/init.c index bc4e9d84157f..e0e6990723e9 100644 --- a/trunk/arch/x86/mm/init.c +++ b/trunk/arch/x86/mm/init.c @@ -385,7 +385,7 @@ void free_initmem(void) } #ifdef CONFIG_BLK_DEV_INITRD -void free_initrd_mem(unsigned long start, unsigned long end) +void __init free_initrd_mem(unsigned long start, unsigned long end) { /* * end could be not aligned, and We can not align that,