From 532f6a3ef1ea8c1f2a65eb4a55a4dbb44d6375b5 Mon Sep 17 00:00:00 2001
From: Jacek Luczak <difrost.kernel@gmail.com>
Date: Thu, 10 Apr 2008 13:40:57 +0200
Subject: [PATCH] --- yaml --- r: 90974 b: refs/heads/master c:
 1a7a34af78923f8807d054a15133a8fcf47e385e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 536275fdb5d6..186db661edcb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 120d5bf128906c790df810e159d2e1239d08fef1
+refs/heads/master: 1a7a34af78923f8807d054a15133a8fcf47e385e
diff --git a/trunk/arch/x86/kernel/e820_64.c b/trunk/arch/x86/kernel/e820_64.c
index 7f6c0c85c8f6..cbd42e51cb08 100644
--- a/trunk/arch/x86/kernel/e820_64.c
+++ b/trunk/arch/x86/kernel/e820_64.c
@@ -96,7 +96,7 @@ void __init early_res_to_bootmem(void)
 }
 
 /* Check for already reserved areas */
-static inline int
+static inline int __init
 bad_addr(unsigned long *addrp, unsigned long size, unsigned long align)
 {
 	int i;
@@ -116,7 +116,7 @@ bad_addr(unsigned long *addrp, unsigned long size, unsigned long align)
 }
 
 /* Check for already reserved areas */
-static inline int
+static inline int __init
 bad_addr_size(unsigned long *addrp, unsigned long *sizep, unsigned long align)
 {
 	int i;