2008-10-25 18:25:03

by Marcin Ślusarz

[permalink] [raw]
Subject: [PATCH] x86: convert highmem macros to functions

convert kmap_init, permanent_kmaps_init, set_highmem_pages_init macros
defined when !CONFIG_HIGHMEM to functions

supresses following warning from gcc:
arch/x86/mm/init_32.c: In function 'pagetable_init':
arch/x86/mm/init_32.c:516: warning: unused variable 'pgd_base'

Signed-off-by: Marcin Slusarz <[email protected]>
Cc: Ingo Molnar <[email protected]>
---
arch/x86/mm/init_32.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 8396868..d5dfdc4 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -436,9 +436,9 @@ static void __init set_highmem_pages_init(void)
#endif /* !CONFIG_NUMA */

#else
-# define kmap_init() do { } while (0)
-# define permanent_kmaps_init(pgd_base) do { } while (0)
-# define set_highmem_pages_init() do { } while (0)
+static inline void kmap_init(void) {}
+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)
--
1.5.6.4