diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /kernel/sysctl.c | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index b475af7ed..c320027fa 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -235,7 +235,7 @@ static ctl_table kern_table[] = { static ctl_table vm_table[] = { {VM_FREEPG, "freepages", - &freepages, sizeof(freepages_t), 0644, NULL, &proc_dointvec}, + &freepages, sizeof(freepages_t), 0444, NULL, &proc_dointvec}, {VM_BDFLUSH, "bdflush", &bdf_prm, 9*sizeof(int), 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec, NULL, &bdflush_min, &bdflush_max}, @@ -283,6 +283,12 @@ static ctl_table fs_table[] = { {FS_OVERFLOWGID, "overflowgid", &fs_overflowgid, sizeof(int), 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec, NULL, &minolduid, &maxolduid}, + {FS_LEASES, "leases-enable", &leases_enable, sizeof(int), + 0644, NULL, &proc_dointvec}, + {FS_DIR_NOTIFY, "dir-notify-enable", &dir_notify_enable, + sizeof(int), 0644, NULL, &proc_dointvec}, + {FS_LEASE_TIME, "lease-break-time", &lease_break_time, sizeof(int), + 0644, NULL, &proc_dointvec}, {0} }; |