diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
| commit | a00428f5b149e36b8225b2a0812742a6dfb07b8c (patch) | |
| tree | a78869cd67cf78a0eb091fb0ea5d397734bd6738 /include/linux/mm.h | |
| parent | 774fee58c465ea1c7e9775e347ec307bcf2deeb3 (diff) | |
| parent | fb5c594c2acc441f0d2d8f457484a0e0e9285db3 (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 75e9f0724997..498ff8778fb6 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -1051,5 +1051,11 @@ int shrink_slab(unsigned long scanned, gfp_t gfp_mask, | |||
| 1051 | void drop_pagecache(void); | 1051 | void drop_pagecache(void); |
| 1052 | void drop_slab(void); | 1052 | void drop_slab(void); |
| 1053 | 1053 | ||
| 1054 | #ifndef CONFIG_MMU | ||
| 1055 | #define randomize_va_space 0 | ||
| 1056 | #else | ||
| 1057 | extern int randomize_va_space; | ||
| 1058 | #endif | ||
| 1059 | |||
| 1054 | #endif /* __KERNEL__ */ | 1060 | #endif /* __KERNEL__ */ |
| 1055 | #endif /* _LINUX_MM_H */ | 1061 | #endif /* _LINUX_MM_H */ |