From db810db3e0f7c387b4653f34a96f491ca2f75123 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Sat, 21 Jul 2007 17:10:39 +0200
Subject: [PATCH] --- yaml --- r: 62395 b: refs/heads/master c:
 9ef231a436fddb34d806f599c97b479691b3c38b h: refs/heads/master i:   62393:
 6d56f1562bffa80039995e8f05ac52e91ab13aef   62391:
 5a544405fc62e362308642a872a627be3be9d997 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/i386/kernel/cpu/mtrr/generic.c | 2 +-
 trunk/arch/i386/kernel/cpu/mtrr/main.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e2fddac32779..69d310dd8d5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b93789808756bcc1e5c90c99f1b1ef52f839a51
+refs/heads/master: 9ef231a436fddb34d806f599c97b479691b3c38b
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/generic.c b/trunk/arch/i386/kernel/cpu/mtrr/generic.c
index f6e46943e6ef..56f64e34829f 100644
--- a/trunk/arch/i386/kernel/cpu/mtrr/generic.c
+++ b/trunk/arch/i386/kernel/cpu/mtrr/generic.c
@@ -79,7 +79,7 @@ static void print_fixed(unsigned base, unsigned step, const mtrr_type*types)
 }
 
 /*  Grab all of the MTRR state for this CPU into *state  */
-void get_mtrr_state(void)
+void __init get_mtrr_state(void)
 {
 	unsigned int i;
 	struct mtrr_var_range *vrs;
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/main.c b/trunk/arch/i386/kernel/cpu/mtrr/main.c
index 75dc6d5214bc..c48b6fea5ab4 100644
--- a/trunk/arch/i386/kernel/cpu/mtrr/main.c
+++ b/trunk/arch/i386/kernel/cpu/mtrr/main.c
@@ -643,7 +643,7 @@ static struct sysdev_driver mtrr_sysdev_driver = {
  * initialized (i.e. before smp_init()).
  * 
  */
-__init void mtrr_bp_init(void)
+void __init mtrr_bp_init(void)
 {
 	init_ifs();