From: Joerg Roedel <joro@8bytes.org>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jiang Liu <jiang.liu@linux.intel.com>
Subject: Re: linux-next: manual merge of the tip tree with the iommu tree
Date: Fri, 5 Jun 2015 10:57:37 +0200 [thread overview]
Message-ID: <20150605085737.GS20384@8bytes.org> (raw)
In-Reply-To: <20150605085030.17051140293@ozlabs.org>
Hi Michael,
On Fri, Jun 05, 2015 at 06:50:30PM +1000, Michael Ellerman wrote:
> diff --cc include/linux/intel-iommu.h
> index a81ceeeaa3d1,0af9b03e2b1c..000000000000
> --- a/include/linux/intel-iommu.h
> +++ b/include/linux/intel-iommu.h
> @@@ -355,9 -349,8 +357,11 @@@ struct intel_iommu
>
> #ifdef CONFIG_IRQ_REMAP
> struct ir_table *ir_table; /* Interrupt remapping info */
> + struct irq_domain *ir_domain;
> + struct irq_domain *ir_msi_domain;
> +
> + /* whether interrupt remapping is enabled prior to OS*/
> + u8 pre_enabled_ir;
> #endif
> struct device *iommu_dev; /* IOMMU-sysfs device */
> int node;
This solution looks correct, thanks for fixing.
Joerg
next parent reply other threads:[~2015-06-05 8:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20150605085030.17051140293@ozlabs.org>
2015-06-05 8:57 ` Joerg Roedel [this message]
2023-04-03 4:36 linux-next: manual merge of the tip tree with the iommu tree Stephen Rothwell
2023-04-03 5:11 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-11-14 4:10 Stephen Rothwell
2022-03-07 1:50 Stephen Rothwell
2021-10-21 1:35 Stephen Rothwell
2021-10-21 15:29 ` Borislav Petkov
2021-11-02 2:57 ` Stephen Rothwell
2020-10-02 5:22 Stephen Rothwell
2020-10-13 3:38 ` Stephen Rothwell
2017-08-22 3:50 Stephen Rothwell
2017-08-22 5:57 ` Baoquan He
2017-08-22 7:49 ` Stephen Rothwell
2017-08-22 8:01 ` Baoquan He
2017-08-22 8:43 ` Stephen Rothwell
2017-08-22 8:50 ` Baoquan He
2017-08-22 8:11 ` Baoquan He
2017-08-23 14:15 ` Tom Lendacky
2017-09-04 5:45 ` Stephen Rothwell
2015-06-17 3:22 Michael Ellerman
2015-06-17 9:57 ` Joerg Roedel
2015-06-17 21:15 ` Michael Ellerman
2015-06-09 6:57 Stephen Rothwell
2015-06-09 6:57 Stephen Rothwell
2011-09-27 5:03 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=20150605085737.GS20384@8bytes.org \
--to=joro@8bytes.org \
--cc=hpa@zytor.com \
--cc=jiang.liu@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mpe@ellerman.id.au \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).