From 2b4efa253c920a327ee2a6b6b4f63b7efc1e3cde Mon Sep 17 00:00:00 2001
From: Ingo Brueckl <ib@wupperonline.de>
Date: Fri, 2 Jan 2009 14:42:00 +0100
Subject: [PATCH] --- yaml --- r: 125415 b: refs/heads/master c:
 a9067d537615d534dcef06c0d819472e43a0d152 h: refs/heads/master i:   125413:
 d0dddee6ca142a21c5c217d9ef027bfa3f06391a   125411:
 855622dbdae20366a988a6ee698fc7f727e38378   125407:
 d003c0ba72d949a780f48457d35ceddb837977df v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/init_32.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 80fbac406fe8..319abefcfbc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c64d8996bd758cedc2ddc04b86ca66fa1d8599cf
+refs/heads/master: a9067d537615d534dcef06c0d819472e43a0d152
diff --git a/trunk/arch/x86/mm/init_32.c b/trunk/arch/x86/mm/init_32.c
index 800e1d94c1b5..ad98b18f2b48 100644
--- a/trunk/arch/x86/mm/init_32.c
+++ b/trunk/arch/x86/mm/init_32.c
@@ -434,8 +434,12 @@ static void __init set_highmem_pages_init(void)
 #endif /* !CONFIG_NUMA */
 
 #else
-# define permanent_kmaps_init(pgd_base)		do { } while (0)
-# define set_highmem_pages_init()	do { } while (0)
+static inline void permanent_kmaps_init(pgd_t *pgd_base)
+{
+}
+static inline void set_highmem_pages_init(void)
+{
+}
 #endif /* CONFIG_HIGHMEM */
 
 void __init native_pagetable_setup_start(pgd_t *base)