diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-04 21:30:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-04 21:30:44 -0800 |
| commit | 58a96a605ee4e5d573bec35c73bb6d015171cc16 (patch) | |
| tree | 52d49ddf2e58f38f457a1e50ffc7254cd8683783 /include/linux/sysctl.h | |
| parent | 55d411d0e475235b36343c10216657d96e9da156 (diff) | |
| parent | 05e7304908ec281ce4ef29d1db58ec8d6fd73563 (diff) | |
Merge bk://gkernel.bkbits.net/libata-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux/sysctl.h')
| -rw-r--r-- | include/linux/sysctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 6b084680aaa1..230d7d4014d4 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -135,6 +135,7 @@ enum KERN_HZ_TIMER=65, /* int: hz timer on or off */ KERN_UNKNOWN_NMI_PANIC=66, /* int: unknown nmi panic flag */ KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */ + KERN_RANDOMIZE=68, /* int: randomize virtual address space */ }; |