2 files changed, 8 insertions, 15 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 288444b4cd8a..0d0bbf218f1f 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1,3 +1,11 @@
+config ARCH
+        string
+        option env="ARCH"
+
+config KERNELVERSION
+        string
+        option env="KERNELVERSION"
+
 config DEFCONFIG_LIST
         string
         depends on !UML
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 99e3d02d1cfc..3929e5b35e79 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -47,7 +47,6 @@ void sym_init(void)
 {
         struct symbol *sym;
         struct utsname uts;
-        char *p;
         static bool inited = false;
 
         if (inited)
@@ -56,20 +55,6 @@ void sym_init(void)
 
         uname(&uts);
 
-        sym = sym_lookup("ARCH", 0);
-        sym->type = S_STRING;
-        sym->flags |= SYMBOL_AUTO;
-        p = getenv("ARCH");
-        if (p)
-                sym_add_default(sym, p);
-
-        sym = sym_lookup("KERNELVERSION", 0);
-        sym->type = S_STRING;
-        sym->flags |= SYMBOL_AUTO;
-        p = getenv("KERNELVERSION");
-        if (p)
-                sym_add_default(sym, p);
-
         sym = sym_lookup("UNAME_RELEASE", 0);
         sym->type = S_STRING;
         sym->flags |= SYMBOL_AUTO;