Import 2.4.0-test2pre4

diff --git a/init/main.c b/init/main.c
index bc64f81d7d2da7be86ec938732abf39dd1e7c4bc..f1cb9e938e0ce378cc701c76f5d33ad0b13ccc79 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -133,44 +133,6 @@ char root_device_name[64];
 static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
 static char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
 
-/*
- * Read an int from an option string; if available accept a subsequent
- * comma as well.
- *
- * Return values:
- * 0 : no int in string
- * 1 : int found, no subsequent comma
- * 2 : int found including a subsequent comma
- */
-int get_option(char **str, int *pint)
-{
-    char *cur = *str;
-
-    if (!cur || !(*cur)) return 0;
-    *pint = simple_strtol(cur,str,0);
-    if (cur==*str) return 0;
-    if (**str==',') {
-        (*str)++;
-        return 2;
-    }
-
-    return 1;
-}
-
-char *get_options(char *str, int nints, int *ints)
-{
-       int res,i=1;
-
-    while (i<nints) {
-        res = get_option(&str, ints+i);
-        if (res==0) break;
-        i++;
-        if (res==1) break;
-    }
-       ints[0] = i-1;
-       return(str);
-}
-
 static int __init profile_setup(char *str)
 {
     int par;

diff --git a/kernel/ksyms.c b/kernel/ksyms.c
index 0da556aaed08ea6087dd6e742c78c764cb9f0944..4a5f167635c95b9643eb99136353680c5997d5b4 100644 (file)
--- a/kernel/ksyms.c
+++ b/kernel/ksyms.c
@@ -82,8 +82,6 @@ EXPORT_SYMBOL(exec_usermodehelper);
 EXPORT_SYMBOL(get_module_symbol);
 EXPORT_SYMBOL(try_inc_mod_count);
 #endif
-EXPORT_SYMBOL(get_option);
-EXPORT_SYMBOL(get_options);
 
 /* process memory management */
 EXPORT_SYMBOL(do_mmap_pgoff);