aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/ggc-page.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ca205f6..82f9da2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-17 Andi Kleen <ak@linux.intel.com>
+
+ * ggc-page.c (USING_MADVISE): Adjust ifdef to check for
+ USING_MMAP.
+
2011-10-17 Georg-Johann Lay <avr@gjlay.de>
* config/avr/avr.h (ASSEMBLER_DIALECT): Remove.
diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index 9b35291..2da99db 100644
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@@ -50,7 +50,7 @@ along with GCC; see the file COPYING3. If not see
#define USING_MALLOC_PAGE_GROUPS
#endif
-#if defined(HAVE_MADVISE) && defined(MADV_DONTNEED)
+#if defined(HAVE_MADVISE) && defined(MADV_DONTNEED) && defined(USING_MMAP)
# define USING_MADVISE
#endif