Re: [patch] my latest oom stuff

Andrea Arcangeli (andrea@e-mind.com)
Wed, 4 Nov 1998 17:09:09 +0100 (CET)


On Wed, 4 Nov 1998, Manuel J. Galan wrote:

>Andrea, you missed to take out the 'swapout_interval' entries in
>'kernel/sysctl.c'
>else kernel does not compile...

Woops, I forgot to include the patch (this fix some more bit btw):

Index: linux/kernel/sysctl.c
diff -u linux/kernel/sysctl.c:1.1.1.2 linux/kernel/sysctl.c:1.1.1.2.4.2
--- linux/kernel/sysctl.c:1.1.1.2 Fri Oct 9 17:44:10 1998
+++ linux/kernel/sysctl.c Fri Oct 30 19:11:17 1998
@@ -34,11 +34,11 @@
#include <linux/nfs_fs.h>
#endif

-#if defined(CONFIG_SYSCTL) && defined(CONFIG_PROC_FS)
+#if defined(CONFIG_SYSCTL)

/* External variables not in a header file. */
extern int panic_timeout;
-extern int console_loglevel, C_A_D, swapout_interval;
+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;
@@ -125,11 +125,11 @@

extern struct proc_dir_entry proc_sys_root;

-extern int inodes_stat[];
-extern int dentry_stat[];
static void register_proc_table(ctl_table *, struct proc_dir_entry *);
static void unregister_proc_table(ctl_table *, struct proc_dir_entry *);
#endif
+extern int inodes_stat[];
+extern int dentry_stat[];

/* The default sysctl tables: */

@@ -199,8 +199,6 @@
static ctl_table vm_table[] = {
{VM_SWAPCTL, "swapctl",
&swap_control, sizeof(swap_control_t), 0644, NULL, &proc_dointvec},
- {VM_SWAPOUT, "swapout_interval",
- &swapout_interval, sizeof(int), 0644, NULL, &proc_dointvec},
{VM_FREEPG, "freepages",
&freepages, sizeof(freepages_t), 0644, NULL, &proc_dointvec},
{VM_BDFLUSH, "bdflush", &bdf_prm, 9*sizeof(int), 0600, NULL,
@@ -866,14 +864,14 @@

#else /* CONFIG_PROC_FS */

-int proc_dointvec_jiffies(ctl_table *table, int write, struct file *filp,
- void *buffer, size_t *lenp)
+int proc_dostring(ctl_table *table, int write, struct file *filp,
+ void *buffer, size_t *lenp)
{
- return -ENOSYS;
+ return -ENOSYS;
}

-int proc_dostring(ctl_table *table, int write, struct file *filp,
- void *buffer, size_t *lenp)
+static int proc_doutsstring(ctl_table *table, int write, struct file *filp,
+ void *buffer, size_t *lenp)
{
return -ENOSYS;
}
@@ -1053,7 +1051,7 @@
}


-#else /* CONFIG_PROC_FS && CONFIG_SYSCTL */
+#else /* CONFIG_SYSCTL */


extern asmlinkage int sys_sysctl(struct __sysctl_args *args)
@@ -1108,8 +1106,5 @@
void unregister_sysctl_table(struct ctl_table_header * table)
{
}
-
-#endif /* CONFIG_PROC_FS && CONFIG_SYSCTL */
-
-

+#endif /* CONFIG_SYSCTL */
Index: linux/include/linux/sysctl.h
diff -u linux/include/linux/sysctl.h:1.1.1.3 linux/include/linux/sysctl.h:1.1.1.2.4.2
--- linux/include/linux/sysctl.h:1.1.1.3 Sat Oct 31 01:16:09 1998
+++ linux/include/linux/sysctl.h Sat Oct 31 01:36:44 1998
@@ -93,7 +93,6 @@
enum
{
/*1*/ VM_SWAPCTL=1, /* struct: Set vm swapping control */
- VM_SWAPOUT, /* int: Background pageout interval */
VM_FREEPG, /* struct: Set free page thresholds */
VM_BDFLUSH, /* struct: Control buffer cache flushing */
VM_OVERCOMMIT_MEMORY, /* Turn off the virtual memory safety limit */

>P.S. congratulations for your fine work in Linux Kernel...

Thanks ;-).

>I hope that studies are going well also... ;-)

Unfortunately no....

Andrea Arcangeli

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/