From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Cc: linux-next@vger•kernel.org,
David Daney <ddaney@caviumnetworks•com>,
Yinghai Lu <yinghai@kernel•org>, Mike Travis <travis@sgi•com>
Subject: linux-next: manual merge of the tip-core tree with Linus' tree
Date: Mon, 2 Feb 2009 11:46:27 +1100 [thread overview]
Message-ID: <20090202114627.76f70d7d.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tip-core tree got a conflict in
kernel/irq/handle.c between commit
97179fd46da7ddedd18e95388130ed3e06c5a0c7 ("cpumask fallout: Initialize
irq_default_affinity earlier") from Linus' tree and commits
9594949b060efe86ecaa1a66839232a3b9800bc9 ("irq: change references from
NR_IRQS to nr_irqs") and 4a046d1754ee6ebb6f399696805ed61ea0444d4c ("x86:
arch_probe_nr_irqs") from the tip-core tree.
Just overlapping additions. I fixed it up as done in tip/master (see
below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc kernel/irq/handle.c
index 3aba8d1,375d68c..0000000
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@@ -146,8 -133,10 +145,12 @@@ int __init early_irq_init(void
int legacy_count;
int i;
+ init_irq_default_affinity();
+
+ /* initialize nr_irqs based on nr_cpu_ids */
+ arch_probe_nr_irqs();
+ printk(KERN_INFO "NR_IRQS:%d nr_irqs:%d\n", NR_IRQS, nr_irqs);
+
desc = irq_desc_legacy;
legacy_count = ARRAY_SIZE(irq_desc_legacy);
@@@ -233,8 -229,8 +243,10 @@@ int __init early_irq_init(void
int count;
int i;
+ init_irq_default_affinity();
+
+ printk(KERN_INFO "NR_IRQS:%d\n", NR_IRQS);
+
desc = irq_desc;
count = ARRAY_SIZE(irq_desc);
next reply other threads:[~2009-02-02 0:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-02 0:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-02-06 2:26 linux-next: manual merge of the tip-core tree with Linus' tree Stephen Rothwell
2009-02-06 13:53 ` Ingo Molnar
2009-02-09 0:38 Stephen Rothwell
2009-02-09 0:46 ` Chris Mason
2009-02-09 8:51 ` Ingo Molnar
2009-04-06 0:36 Stephen Rothwell
2009-05-21 1:39 Stephen Rothwell
2009-05-21 3:56 ` Darren Hart
2009-05-21 9:30 ` Thomas Gleixner
2009-05-21 9:38 ` Stephen Rothwell
2009-05-22 0:19 ` Stephen Rothwell
2009-05-22 5:50 ` Stephen Rothwell
2009-05-22 18:18 ` Darren Hart
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=20090202114627.76f70d7d.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ddaney@caviumnetworks$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=tglx@linutronix$(echo .)de \
--cc=travis@sgi$(echo .)com \
--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