diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
| commit | aba344fdfed81b2c03d6114c54cfd73a486aa10b (patch) | |
| tree | d032d8430bf1234c3ecc6f6330d6de6e887e5963 /kernel/sysctl.c | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 2d4fb7169..d7b460fc9 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -34,7 +34,6 @@ extern int panic_timeout; extern int console_loglevel, C_A_D; extern int bdf_prm[], bdflush_min[], bdflush_max[]; -extern char binfmt_java_interpreter[], binfmt_java_appletviewer[]; extern int sysctl_overcommit_memory; extern int nr_queued_signals, max_queued_signals; @@ -121,7 +120,7 @@ struct inode_operations proc_sys_inode_operations = NULL, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ - NULL, /* bmap */ + NULL, /* get_block */ NULL, /* readpage */ NULL, /* writepage */ NULL, /* flushpage */ @@ -171,12 +170,6 @@ static ctl_table kern_table[] = { {KERN_REALROOTDEV, "real-root-dev", &real_root_dev, sizeof(int), 0644, NULL, &proc_dointvec}, #endif -#ifdef CONFIG_BINFMT_JAVA - {KERN_JAVA_INTERPRETER, "java-interpreter", binfmt_java_interpreter, - 64, 0644, NULL, &proc_dostring, &sysctl_string }, - {KERN_JAVA_APPLETVIEWER, "java-appletviewer", binfmt_java_appletviewer, - 64, 0644, NULL, &proc_dostring, &sysctl_string }, -#endif #ifdef __sparc__ {KERN_SPARC_REBOOT, "reboot-cmd", reboot_command, 256, 0644, NULL, &proc_dostring, &sysctl_string }, |