diff options
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index c468c3c6dfc5..cfc5295f1e82 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -96,7 +96,7 @@ static int sixty = 60; | |||
96 | static int neg_one = -1; | 96 | static int neg_one = -1; |
97 | #endif | 97 | #endif |
98 | 98 | ||
99 | #ifdef CONFIG_MMU | 99 | #if defined(CONFIG_MMU) && defined(CONFIG_FILE_LOCKING) |
100 | static int two = 2; | 100 | static int two = 2; |
101 | #endif | 101 | #endif |
102 | 102 | ||
@@ -1248,6 +1248,7 @@ static struct ctl_table fs_table[] = { | |||
1248 | .extra1 = &minolduid, | 1248 | .extra1 = &minolduid, |
1249 | .extra2 = &maxolduid, | 1249 | .extra2 = &maxolduid, |
1250 | }, | 1250 | }, |
1251 | #ifdef CONFIG_FILE_LOCKING | ||
1251 | { | 1252 | { |
1252 | .ctl_name = FS_LEASES, | 1253 | .ctl_name = FS_LEASES, |
1253 | .procname = "leases-enable", | 1254 | .procname = "leases-enable", |
@@ -1256,6 +1257,7 @@ static struct ctl_table fs_table[] = { | |||
1256 | .mode = 0644, | 1257 | .mode = 0644, |
1257 | .proc_handler = &proc_dointvec, | 1258 | .proc_handler = &proc_dointvec, |
1258 | }, | 1259 | }, |
1260 | #endif | ||
1259 | #ifdef CONFIG_DNOTIFY | 1261 | #ifdef CONFIG_DNOTIFY |
1260 | { | 1262 | { |
1261 | .ctl_name = FS_DIR_NOTIFY, | 1263 | .ctl_name = FS_DIR_NOTIFY, |
@@ -1267,6 +1269,7 @@ static struct ctl_table fs_table[] = { | |||
1267 | }, | 1269 | }, |
1268 | #endif | 1270 | #endif |
1269 | #ifdef CONFIG_MMU | 1271 | #ifdef CONFIG_MMU |
1272 | #ifdef CONFIG_FILE_LOCKING | ||
1270 | { | 1273 | { |
1271 | .ctl_name = FS_LEASE_TIME, | 1274 | .ctl_name = FS_LEASE_TIME, |
1272 | .procname = "lease-break-time", | 1275 | .procname = "lease-break-time", |
@@ -1278,6 +1281,7 @@ static struct ctl_table fs_table[] = { | |||
1278 | .extra1 = &zero, | 1281 | .extra1 = &zero, |
1279 | .extra2 = &two, | 1282 | .extra2 = &two, |
1280 | }, | 1283 | }, |
1284 | #endif | ||
1281 | { | 1285 | { |
1282 | .procname = "aio-nr", | 1286 | .procname = "aio-nr", |
1283 | .data = &aio_nr, | 1287 | .data = &aio_nr, |