From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 25 Apr 2008 16:28:21 +0000 (+0200)
Subject: x86: make __set_fixmap() non-init
X-Git-Tag: v2.6.26-rc1~1073^2~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=82a355f5a2fdc203e5a32626d667ec43fc76b8b1;p=~shefty%2Frdma-dev.git

x86: make __set_fixmap() non-init

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 1ff7906a9a4..7a81dd02069 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -135,7 +135,7 @@ static __init void *spp_getpage(void)
 	return ptr;
 }
 
-static __init void
+static void
 set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot)
 {
 	pgd_t *pgd;
@@ -214,8 +214,7 @@ void __init cleanup_highmap(void)
 }
 
 /* NOTE: this is meant to be run only at boot */
-void __init
-__set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
+void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
 {
 	unsigned long address = __fix_to_virt(idx);