2001-10-15 10:56:53

by Jesper Juhl

[permalink] [raw]
Subject: various minor cleanups for 2.4.13-pre2 (patch included, comments wanted :)

diff -ur linux-2.4.13-pre2-orig/init/main.c linux-2.4.13-pre2/init/main.c
--- linux-2.4.13-pre2-orig/init/main.c Sun Oct 14 10:23:21 2001
+++ linux-2.4.13-pre2/init/main.c Sun Oct 14 11:23:09 2001
@@ -291,7 +291,7 @@

static int __init root_dev_setup(char *line)
{
- int i;
+ unsigned int i;
char ch;

ROOT_DEV = name_to_kdev_t(line);
@@ -465,11 +465,11 @@
*/
if (strchr(line,'=')) {
if (envs >= MAX_INIT_ENVS)
- break;
+ continue;
envp_init[++envs] = line;
} else {
if (args >= MAX_INIT_ARGS)
- break;
+ continue;
if (*line)
argv_init[++args] = line;
}
diff -ur linux-2.4.13-pre2-orig/kernel/exec_domain.c linux-2.4.13-pre2/kernel/exec_domain.c
--- linux-2.4.13-pre2-orig/kernel/exec_domain.c Fri Oct 5 01:41:54 2001
+++ linux-2.4.13-pre2/kernel/exec_domain.c Sun Oct 14 12:07:50 2001
@@ -40,8 +40,7 @@
};


-static void
-default_handler(int segment, struct pt_regs *regp)
+static void default_handler(int segment, struct pt_regs *regp)
{
u_long pers = 0;

@@ -73,8 +72,7 @@
send_sig(SIGSEGV, current, 1);
}

-static struct exec_domain *
-lookup_exec_domain(u_long personality)
+static struct exec_domain *lookup_exec_domain(u_long personality)
{
struct exec_domain * ep;
char buffer[30];
@@ -106,8 +104,7 @@
return (ep);
}

-int
-register_exec_domain(struct exec_domain *ep)
+int register_exec_domain(struct exec_domain *ep)
{
struct exec_domain *tmp;
int err = -EBUSY;
@@ -133,8 +130,7 @@
return (err);
}

-int
-unregister_exec_domain(struct exec_domain *ep)
+int unregister_exec_domain(struct exec_domain *ep)
{
struct exec_domain **epp;

@@ -154,8 +150,7 @@
return 0;
}

-int
-__set_personality(u_long personality)
+int __set_personality(u_long personality)
{
struct exec_domain *ep, *oep;

@@ -201,11 +196,10 @@
return 0;
}

-int
-get_exec_domain_list(char *page)
+int get_exec_domain_list(char *page)
{
struct exec_domain *ep;
- int len = 0;
+ unsigned int len = 0;

read_lock(&exec_domains_lock);
for (ep = exec_domains; ep && len < PAGE_SIZE - 80; ep = ep->next)
@@ -216,8 +210,7 @@
return (len);
}

-asmlinkage long
-sys_personality(u_long personality)
+asmlinkage long sys_personality(u_long personality)
{
u_long old = current->personality;;

@@ -274,8 +267,7 @@
{0}
};

-static int __init
-abi_register_sysctl(void)
+static int __init abi_register_sysctl(void)
{
register_sysctl_table(abi_root_table, 1);
return 0;


Attachments:
2.4.13-pre2-misc.patch (2.41 kB)