From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Woodhouse <dwmw2@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Song,
Youquan" <youquan.song@intel.com>,
Suresh Siddha <suresh.b.siddha@intel.com>,
Ingo Molnar <mingo@elte.hu>
Subject: linux-next: manual merge of the dwmw2-iommu tree with Linus' tree
Date: Wed, 25 May 2011 13:00:04 +1000 [thread overview]
Message-ID: <20110525130004.150c054f.sfr@canb.auug.org.au> (raw)
Hi David,
Today's linux-next merge of the dwmw2-iommu tree got a conflict in
arch/x86/kernel/apic/apic.c between commit 31dce14a3269 ("x86, ioapic:
Use ioapic_saved_data while enabling intr-remapping") from Linus' tree and
commit 6a87c5ec6463 ("intel-iommu: enable x2apic opt out") from the
dwmw2-iommu tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/kernel/apic/apic.c
index b961af8,fb1c36c..0000000
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@@ -1461,16 -1450,24 +1461,17 @@@ int __init enable_IR(void
void __init enable_IR_x2apic(void)
{
unsigned long flags;
- int ret, x2apic_enabled = 0;
- struct IO_APIC_route_entry **ioapic_entries;
+ int ret = 0, x2apic_enabled = 0;
int dmar_table_init_ret;
dmar_table_init_ret = dmar_table_init();
- if (dmar_table_init_ret && !x2apic_supported())
+ if (dmar_table_init_ret && !cpu_has_x2apic)
return;
- ioapic_entries = alloc_ioapic_entries();
- if (!ioapic_entries) {
- pr_err("Allocate ioapic_entries failed\n");
- goto out;
- }
-
- ret = save_IO_APIC_setup(ioapic_entries);
+ ret = save_ioapic_entries();
if (ret) {
pr_info("Saving IO-APIC state failed: %d\n", ret);
+ ret = 0;
goto out;
}
next reply other threads:[~2011-05-25 3:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-25 3:00 Stephen Rothwell [this message]
2011-05-25 9:16 ` Ingo Molnar
2011-05-25 10:57 ` David Woodhouse
2011-05-25 11:40 ` Ingo Molnar
2011-05-25 20:16 ` Youquan Song
2011-05-25 20:59 ` David Woodhouse
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=20110525130004.150c054f.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=suresh.b.siddha@intel.com \
--cc=youquan.song@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®