summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorGary King <gking@nvidia.com>2009-12-07 16:18:05 -0800
committerGary King <gking@nvidia.com>2009-12-07 16:18:05 -0800
commitbb11d46b72a4a2b53f890faa970a380cf0084bf2 (patch)
tree2d9d2955e069fed69febbe567a835fcc48ec6ec6 /init
parente1b5e49debba7174e7b9c48195de8abfd54911dd (diff)
parent74ece4056571443eef30d4dff62180944b5a39d8 (diff)
Merge commit 'arm/2.6.28-arm' into android-tegra-2.6.29
Conflicts: MAINTAINERS arch/arm/Kconfig arch/arm/Makefile arch/arm/boot/compressed/head.S arch/arm/common/Makefile arch/arm/configs/realview-smp_defconfig arch/arm/configs/realview_defconfig arch/arm/configs/versatile_defconfig arch/arm/include/asm/elf.h arch/arm/include/asm/uaccess.h arch/arm/kernel/module.c arch/arm/kernel/signal.c arch/arm/mach-realview/Kconfig arch/arm/mach-realview/Makefile arch/arm/mach-realview/core.c arch/arm/mach-realview/core.h arch/arm/mach-realview/include/mach/board-pba8.h arch/arm/mach-realview/include/mach/debug-macro.S arch/arm/mach-realview/include/mach/hardware.h arch/arm/mach-realview/include/mach/irqs.h arch/arm/mach-realview/include/mach/memory.h arch/arm/mach-realview/include/mach/uncompress.h arch/arm/mach-realview/localtimer.c arch/arm/mach-realview/platsmp.c arch/arm/mach-realview/realview_eb.c arch/arm/mach-realview/realview_pb1176.c arch/arm/mach-realview/realview_pb11mp.c arch/arm/mach-realview/realview_pba8.c arch/arm/mm/Kconfig arch/arm/mm/copypage-v6.c arch/arm/mm/dma-mapping.c arch/arm/mm/proc-v7.S arch/arm/oprofile/op_model_mpcore.c arch/arm/tools/mach-types arch/arm/vfp/vfpmodule.c drivers/mtd/maps/integrator-flash.c drivers/net/smsc911x.c drivers/net/smsc911x.h
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig8
-rw-r--r--init/main.c5
2 files changed, 12 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index bc991549ee6d..9af864429cff 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -672,6 +672,14 @@ config CC_OPTIMIZE_FOR_SIZE
If unsure, say Y.
+config CC_OPTIMIZE_FOR_DEBUG
+ bool "Optimize for debug"
+ depends on !CC_OPTIMIZE_FOR_SIZE
+ help
+ Enabling this option will pass "-O1" instead of "-O2" to gcc
+ resulting in a better debug illusion, but also a larger and
+ slower kernel.
+
config SYSCTL
bool
diff --git a/init/main.c b/init/main.c
index 83697e160b3a..52c0a0eed035 100644
--- a/init/main.c
+++ b/init/main.c
@@ -779,8 +779,11 @@ static void __init do_pre_smp_initcalls(void)
static void run_init_process(char *init_filename)
{
+ long ret;
+
argv_init[0] = init_filename;
- kernel_execve(init_filename, argv_init, envp_init);
+ ret = kernel_execve(init_filename, argv_init, envp_init);
+ printk(KERN_INFO "%s exit code: %ld\n", init_filename, ret);
}
/* This is a non __init function. Force it to be noinline otherwise gcc