diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
| commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
| tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /include/asm-i386/page.h | |
| parent | 03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff) | |
| parent | f56df2f4db6e4af87fb8e941cff69f4501a111df (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/asm-i386/page.h')
| -rw-r--r-- | include/asm-i386/page.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h index fd3f64ace248..7b19f454761d 100644 --- a/include/asm-i386/page.h +++ b/include/asm-i386/page.h | |||
| @@ -143,7 +143,9 @@ extern int page_is_ram(unsigned long pagenr); | |||
| 143 | #include <asm-generic/memory_model.h> | 143 | #include <asm-generic/memory_model.h> |
| 144 | #include <asm-generic/page.h> | 144 | #include <asm-generic/page.h> |
| 145 | 145 | ||
| 146 | #ifndef CONFIG_COMPAT_VDSO | ||
| 146 | #define __HAVE_ARCH_GATE_AREA 1 | 147 | #define __HAVE_ARCH_GATE_AREA 1 |
| 148 | #endif | ||
| 147 | #endif /* __KERNEL__ */ | 149 | #endif /* __KERNEL__ */ |
| 148 | 150 | ||
| 149 | #endif /* _I386_PAGE_H */ | 151 | #endif /* _I386_PAGE_H */ |