diff options
| author | David S. Miller <davem@picasso.davemloft.net> | 2005-03-05 04:48:01 -0800 |
|---|---|---|
| committer | David S. Miller <davem@picasso.davemloft.net> | 2005-03-05 04:48:01 -0800 |
| commit | aa02c666ed857ef288db07cfa146d0da867645a5 (patch) | |
| tree | 26f1dfff2c3756d9090a048834140fe3855b4f5e /include/linux/kernel.h | |
| parent | 9ebe3d6ea6848ed70c224ca33cd581a5ea1772be (diff) | |
| parent | 58a96a605ee4e5d573bec35c73bb6d015171cc16 (diff) | |
Merge davem@nuts:/disk1/BK/set_pte-2.6
into picasso.davemloft.net:/home/davem/src/BK/set_pte-2.6
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 806491a0ab59..de56b8b26cd5 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -278,6 +278,12 @@ struct sysinfo { extern void BUILD_BUG(void); #define BUILD_BUG_ON(condition) do { if (condition) BUILD_BUG(); } while(0) +#ifdef CONFIG_SYSCTL +extern int randomize_va_space; +#else +#define randomize_va_space 1 +#endif + /* Trap pasters of __FUNCTION__ at compile-time */ #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95 #define __FUNCTION__ (__func__) |