summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/setup.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-01-19 10:13:14 +0100
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-07-07 16:38:36 +0200
commit73a65b3f8587fa1c83768515ecc0bf6fa44ccdd1 (patch)
tree89a93172ce10f0e965c02b4a14aa55475ef88673 /arch/arm/kernel/setup.c
parent8d68fe7029ed2631363f6f37155586c0707b8dc0 (diff)
downloadop-kernel-dev-73a65b3f8587fa1c83768515ecc0bf6fa44ccdd1.zip
op-kernel-dev-73a65b3f8587fa1c83768515ecc0bf6fa44ccdd1.tar.gz
ARM: deprecate support for old way to pass kernel parameters
This was deprecated in 2001 and announced to live on for 5 years. For now provide a kernel parameter for those who still need it. Acked-by: Eric Miao <eric.miao@canonical.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/kernel/setup.c')
-rw-r--r--arch/arm/kernel/setup.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 122d999..cbc6ddb 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -44,7 +44,9 @@
#include <asm/traps.h>
#include <asm/unwind.h>
+#if defined(CONFIG_DEPRECATED_PARAM_STRUCT)
#include "compat.h"
+#endif
#include "atags.h"
#include "tcm.h"
@@ -663,6 +665,13 @@ static int __init customize_machine(void)
}
arch_initcall(customize_machine);
+static void __init squash_mem_tags(struct tag *tag)
+{
+ for (; tag->hdr.size; tag = tag_next(tag))
+ if (tag->hdr.tag == ATAG_MEM)
+ tag->hdr.tag = ATAG_NONE;
+}
+
void __init setup_arch(char **cmdline_p)
{
struct tag *tags = (struct tag *)&init_tags;
@@ -683,12 +692,14 @@ void __init setup_arch(char **cmdline_p)
else if (mdesc->boot_params)
tags = phys_to_virt(mdesc->boot_params);
+#if defined(CONFIG_DEPRECATED_PARAM_STRUCT)
/*
* If we have the old style parameters, convert them to
* a tag list.
*/
if (tags->hdr.tag != ATAG_CORE)
convert_to_tag_list(tags);
+#endif
if (tags->hdr.tag != ATAG_CORE)
tags = (struct tag *)&init_tags;
OpenPOWER on IntegriCloud