| Message ID | 98608b2e-d138-4dc0-808d-3662ab2c9938@VA3EHSMHS025.ehs.local (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Grant Likely |
| Headers | show |
On Thu, Nov 18, 2010 at 03:54:57PM -0800, Stephen Neuendorffer wrote: > A few support device-tree related support functions that x86 didn't > have before. > > Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xilinx.com> Skipping this patch. I expect to pick up Dirk's version instead. g. > > ---- > > Looks like just some irq related junk left! > --- > arch/x86/include/asm/irq.h | 2 ++ > arch/x86/kernel/irq.c | 11 +++++++++++ > 2 files changed, 13 insertions(+), 0 deletions(-) > > diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h > index 5458380..af4e630 100644 > --- a/arch/x86/include/asm/irq.h > +++ b/arch/x86/include/asm/irq.h > @@ -10,6 +10,8 @@ > #include <asm/apicdef.h> > #include <asm/irq_vectors.h> > > +#define irq_dispose_mapping(...) > + > static inline int irq_canonicalize(int irq) > { > return ((irq == 2) ? 9 : irq); > diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c > index 91fd0c7..a3aaed4 100644 > --- a/arch/x86/kernel/irq.c > +++ b/arch/x86/kernel/irq.c > @@ -364,3 +364,14 @@ void fixup_irqs(void) > } > } > #endif > + > +#ifdef CONFIG_OF > +#include <linux/of_irq.h> > +unsigned int irq_create_of_mapping(struct device_node *controller, > + const u32 *intspec, unsigned int intsize) > +{ > + return intspec[0] + 1; > +} > +EXPORT_SYMBOL_GPL(irq_create_of_mapping); > + > +#endif > -- > 1.5.6.6 > > > > This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. > >
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h index 5458380..af4e630 100644 --- a/arch/x86/include/asm/irq.h +++ b/arch/x86/include/asm/irq.h @@ -10,6 +10,8 @@ #include <asm/apicdef.h> #include <asm/irq_vectors.h> +#define irq_dispose_mapping(...) + static inline int irq_canonicalize(int irq) { return ((irq == 2) ? 9 : irq); diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 91fd0c7..a3aaed4 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -364,3 +364,14 @@ void fixup_irqs(void) } } #endif + +#ifdef CONFIG_OF +#include <linux/of_irq.h> +unsigned int irq_create_of_mapping(struct device_node *controller, + const u32 *intspec, unsigned int intsize) +{ + return intspec[0] + 1; +} +EXPORT_SYMBOL_GPL(irq_create_of_mapping); + +#endif
A few support device-tree related support functions that x86 didn't have before. Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xilinx.com> ---- Looks like just some irq related junk left! --- arch/x86/include/asm/irq.h | 2 ++ arch/x86/kernel/irq.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-)