diff options
author | Steve French <sfrench@us.ibm.com> | 2006-02-22 23:38:53 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-02-22 23:38:53 +0000 |
commit | 5d2f248a5f3acac4b763439327c92091be7abb1c (patch) | |
tree | 8f30098a6d17c0367adfbb780e5a8d9a5c43ad5a /include/linux/mm.h | |
parent | a048d7a8704b35ff6372fdf5eedd4533f37b1885 (diff) | |
parent | 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 (diff) | |
download | kernel-crypto-5d2f248a5f3acac4b763439327c92091be7abb1c.tar.gz kernel-crypto-5d2f248a5f3acac4b763439327c92091be7abb1c.tar.xz kernel-crypto-5d2f248a5f3acac4b763439327c92091be7abb1c.zip |
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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 26e1663a5cb..498ff8778fb 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1051,7 +1051,11 @@ int shrink_slab(unsigned long scanned, gfp_t gfp_mask, void drop_pagecache(void); void drop_slab(void); +#ifndef CONFIG_MMU +#define randomize_va_space 0 +#else extern int randomize_va_space; +#endif #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ |