arch/um: Renamed CONFIG_DEBUGSYM to CONFIG_DEBUG_INFO

arch/um/Kconfig

@@ -219,7 +219,7 @@ config DEBUG_SLAB
 config DEBUG_SPINLOCK
 	bool "Debug spinlocks usage"
 
-config DEBUGSYM
+config DEBUG_INFO
 	bool "Enable kernel debugging symbols"
 	help
         When this is enabled, the User-Mode Linux binary will include
@@ -232,15 +232,15 @@ config DEBUGSYM
 
 config FRAME_POINTER
 	bool
-	default y if DEBUGSYM
+	default y if DEBUG_INFO
 
 config PT_PROXY
 	bool "Enable ptrace proxy"
-	depends on XTERM_CHAN && DEBUGSYM
+	depends on XTERM_CHAN && DEBUG_INFO
 
 config GPROF
 	bool "Enable gprof support"
-	depends on DEBUGSYM
+	depends on DEBUG_INFO
 	help
         This allows profiling of a User-Mode Linux kernel with the gprof
         utility.
@@ -253,7 +253,7 @@ config GPROF
 
 config GCOV
 	bool "Enable gcov support"
-	depends on DEBUGSYM
+	depends on DEBUG_INFO
 	help
         This option allows developers to retrieve coverage data from a UML
         session.

arch/um/Makefile

@@ -13,12 +13,10 @@ OS := $(shell uname -s)
 # EXTRAVERSION...
 MODLIB := $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
 
-ifeq ($(CONFIG_DEBUGSYM),y)
+ifeq ($(CONFIG_DEBUG_INFO),y)
 CFLAGS := $(subst -fomit-frame-pointer,,$(CFLAGS))
 endif
 
-CFLAGS-$(CONFIG_DEBUGSYM) += -g
-
 core-y			+= $(ARCH_DIR)/kernel/		 \
 			   $(ARCH_DIR)/drivers/          \
 			   $(ARCH_DIR)/sys-$(SUBARCH)/

arch/um/config.release

@@ -329,7 +329,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # Kernel hacking
 #
 # CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUGSYM is not set
+# CONFIG_DEBUG_INFO is not set
 # CONFIG_PT_PROXY is not set
 # CONFIG_GPROF is not set
 # CONFIG_GCOV is not set

arch/um/defconfig

@@ -399,7 +399,7 @@ CONFIG_MTD_BLKMTD=m
 #
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUGSYM=y
+CONFIG_DEBUG_INFO=y
 CONFIG_FRAME_POINTER=y
 CONFIG_PT_PROXY=y
 # CONFIG_GPROF is not set