From bb8990e0badd7016cc65e9376c2543ee9f3c192b 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: 125095 b: refs/heads/master c:
 e8e32326279cba3d049b4325111f76618953195c h: refs/heads/master i:   125093:
 2b0baf5ecfe86056d729b4d7a2350c9aa5d6608e   125091:
 025cc8bac74bcee130efa665ef706988748a13e8   125087:
 73c22f800643c0309235562f8d08d65c3dbe307a 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 8269080d2cc4..d026da3ec0e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2fde28ce793c09c1ea36d981cb6765174fd1eea
+refs/heads/master: e8e32326279cba3d049b4325111f76618953195c
diff --git a/trunk/arch/x86/mm/init_32.c b/trunk/arch/x86/mm/init_32.c
index 8655b5bb0963..f99a6c6c432e 100644
--- a/trunk/arch/x86/mm/init_32.c
+++ b/trunk/arch/x86/mm/init_32.c
@@ -435,8 +435,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)