diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-02-18 10:07:18 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-02-18 10:07:18 -0500 |
| commit | e601ef22bc5ec9332c8d785533895ee81c834b8a (patch) | |
| tree | 4685a666fe2a553dccdfe7b4b3f88816d075b29e /include/linux/mm.h | |
| parent | 27754b34600770beb38e3ae12cb3f345f02e3797 (diff) | |
| parent | bd71c2b17468a2531fb4c81ec1d73520845e97e1 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 75e9f0724997..26e1663a5cbe 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -1051,5 +1051,7 @@ 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 | extern int randomize_va_space; | ||
| 1055 | |||
| 1054 | #endif /* __KERNEL__ */ | 1056 | #endif /* __KERNEL__ */ |
| 1055 | #endif /* _LINUX_MM_H */ | 1057 | #endif /* _LINUX_MM_H */ |