Hi Rusty,
Today's linux-next merge of the boot-params tree got a conflict in
init/main.c between commit 0b8f1efad30bd58f89961b82dfe68b9edf8fd2ac
("sparse irq_desc[] array: core kernel and x86 changes") from the
sparseirq tree and commit 25bf48b74b9fb23b347d00656b604f9e55c72183 ("Fix
powerpc (tested on ppc64) command line handling") from the boot-params
tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc init/main.c
index 396b271,ad933ad..0000000
--- a/init/main.c
+++ b/init/main.c
@@@ -543,20 -522,30 +526,40 @@@ void __init __weak thread_info_cache_in
{
}
+int __init __weak arch_early_irq_init(void)
+{
+ return 0;
+}
+
+int __init __weak early_irq_init(void)
+{
+ return arch_early_irq_init();
+}
+
+ /* Non-destructive early parse of commandline. PowerPC calls this early. */
+ void __init parse_early_and_core_params(char *cmdline)
+ {
+ static bool __initdata done = false;
+
+ if (done)
+ return;
+
+ parse_args("Core and early params", cmdline,
+ __start___core_param,
+ __stop___core_param - __start___core_param,
+ do_early_param, true);
+ done = true;
+ }
+
asmlinkage void __init start_kernel(void)
{
- char * command_line;
- extern struct kernel_param __start___param[], __stop___param[];
+ char *static_command_line;
+
+ printk(KERN_NOTICE);
+ printk(linux_banner);
+
+ arch_get_boot_command_line();
+ parse_early_and_core_params(boot_command_line);
smp_setup_processor_id();
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
