include/linux/compiler*.h: make compiler-*.h mutually exclusive

[linux.git] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index 4a83268e23c2ee656dbdd1df4a56badc068a5122..c27e97b5b69ddf54d05a239f2278acd2eb8ddecd 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1131,7 +1131,8 @@ static int __unmap_and_move(struct page *page, struct page *newpage,
  * gcc 4.7 and 4.8 on arm get an ICEs when inlining unmap_and_move().  Work
  * around it.
  */
-#if (GCC_VERSION >= 40700 && GCC_VERSION < 40900) && defined(CONFIG_ARM)
+#if defined(CONFIG_ARM) && \
+       defined(GCC_VERSION) && GCC_VERSION < 40900 && GCC_VERSION >= 40700
 #define ICE_noinline noinline
 #else
 #define ICE_noinline