From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rusty Russell <rusty@rustcorp•com.au>
Cc: linux-next@vger•kernel.org, Yinghai Lu <yinghai@kernel•org>,
Ingo Molnar <mingo@elte•hu>
Subject: linux-next: manual merge of the boot-params tree
Date: Tue, 16 Dec 2008 00:20:54 +1100 [thread overview]
Message-ID: <20081216002054.62a446fe.sfr@canb.auug.org.au> (raw)
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 0de5c2d9f02d2018fd671ca1015432dffa5eb338
("param: arch_get_boot_command_line()") 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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc init/main.c
index 1d3ccf8,e0d6592..0000000
--- a/init/main.c
+++ b/init/main.c
@@@ -543,19 -522,19 +526,28 @@@ void __init __weak thread_info_cache_in
{
}
+void __init __weak arch_early_irq_init(void)
+{
+}
+
+void __init __weak early_irq_init(void)
+{
+ arch_early_irq_init();
+}
+
+ /* Ideally, this would take a 'const char *cmdline' param. */
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_args("Core and early params", boot_command_line,
+ __start___core_param,
+ __stop___core_param - __start___core_param,
+ do_early_param, true);
smp_setup_processor_id();
next reply other threads:[~2008-12-15 13:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-15 13:20 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-12-15 13:20 linux-next: manual merge of the boot-params tree Stephen Rothwell
2008-12-15 13:21 Stephen Rothwell
2008-12-15 13:21 Stephen Rothwell
2008-12-18 9:35 Stephen Rothwell
2008-12-29 14:01 Stephen Rothwell
2008-12-29 14:10 Stephen Rothwell
2008-12-29 21:22 ` Rusty Russell
2008-12-29 14:22 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081216002054.62a446fe.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=yinghai@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox