From 54f59054d657dcd805abbab3129673838f5810c9 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 25 Apr 2008 18:28:21 +0200
Subject: [PATCH] --- yaml --- r: 92977 b: refs/heads/master c:
 82a355f5a2fdc203e5a32626d667ec43fc76b8b1 h: refs/heads/master i:   92975:
 afec255521ddc69201480941357f5353d3c40272 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/init_64.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2dca27360b48..4667a62e806b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ec96783e3c1d21bf9a1fa3f238f8354c92827f6
+refs/heads/master: 82a355f5a2fdc203e5a32626d667ec43fc76b8b1
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
index 1ff7906a9a4d..7a81dd020693 100644
--- a/trunk/arch/x86/mm/init_64.c
+++ b/trunk/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);