Missing include in include/asm-powerpc/prom.h
PATCH 1/1 Missing include in include/asm-powerpc/prom.h
Missing include in include/asm-powerpc/prom.h
include/asm-powerpc/prom.h needs to include asm/irq.h because it uses irq_of_parse_and_map and NO_IRQ. It applies on 2.6.20.
include/asm-powerpc/prom.h +1 -0
@@ -19,6 +19,7 @@#include <linux/proc_fs.h> #include <linux/platform_device.h> #include <asm/atomic.h> +#include <asm/irq.h> /* Definitions used by the flattened device tree */ #define OF_DT_HEADER 0xd00dfeed/* marker */
Signature · 2 lines
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
Quoted 4 lines · Mathieu Desnoyers
Missing include in
include/asm-powerpc/prom.h
include/asm-powerpc/prom.hneeds to includeasm/irq.hbecause it usesirq_of_parse_and_mapandNO_IRQ. It applies on 2.6.20.
I'd rather not do that.... better to move of_irq_to_resource() to prom_parse.c
Ben
Quoted 9 lines · * Benjamin Herrenschmidt ([email protected]) wrote:
Quoted 4 lines · Mathieu Desnoyers
Missing include in
include/asm-powerpc/prom.h
=20include/asm-powerpc/prom.hneeds to includeasm/irq.hbecause it usesirq_of_parse_and_mapandNO_IRQ. It applies on 2.6.20.=20
I'd rather not do that.... better to moveof_irq_to_resource()to prom_parse.c=20
=20
Thanks, this patch should apply on top of the previous patch in this thread.
arch/powerpc/kernel/prom_parse.c +0 -0
@@ -1003,3 +1003,18 @@ int of_irq_map_one(struct device_node *device, int i=
ndex, struct of_irq *out_irq
return res;
}
EXPORT_SYMBOL_GPL(of_irq_map_one);
+
+int of_irq_to_resource(struct device_node *dev, int index, struct resource=
*r)
+{
+ int irq =3D irq_of_parse_and_map(dev, index);
+
+ /* Only dereference the resource if both the
+ * resource and the irq are valid. */
+ if (r && irq !=3D NO_IRQ) {
+ r->start =3D r->end =3D irq;
+ r->flags =3D IORESOURCE_IRQ;
+ }
+
+ return irq;
+}
+EXPORT_SYMBOL_GPL(of_irq_to_resource);
include/asm-powerpc/prom.h +0 -0
@@ -335,20 +335,8 @@ extern int of_irq_map_one(struct device_node *device, =
int index,
struct pci_dev;
extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);
=20
-static inline int of_irq_to_resource(struct device_node *dev, int index, s= truct resource *r)
-{
- int irq =3D irq_of_parse_and_map(dev, index);
-
- /* Only dereference the resource if both the
- * resource and the irq are valid. */
- if (r && irq !=3D NO_IRQ) {
- r->start =3D r->end =3D irq;
- r->flags =3D IORESOURCE_IRQ;
- }
-
- return irq;
-}
-
+extern int of_irq_to_resource(struct device_node *dev, int index,
+ struct resource *r);
=20
#endif /* __KERNEL__ */
#endif /* _POWERPC_PROM_H */
--=20
Mathieu Desnoyers
Computer Engineering Graduate Student, =C9cole Polytechnique de Montr=E9al OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
Quoted 4 lines · Mathieu Desnoyers
Quoted 3 lines · * Benjamin Herrenschmidt ([email protected]) wrote:
Quoted 2 lines · Mathieu Desnoyers
Missing include in
include/asm-powerpc/prom.h
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
include/asm-powerpc/prom.hneeds to includeasm/irq.hbecause it usesirq_of_parse_and_mapandNO_IRQ. It applies on 2.6.20.I'd rather not do that.... better to move
of_irq_to_resource()toprom_parse.cThanks, this patch should apply on top of the previous patch in this thread.
Do you actually want this patch to go upstream? Because if you do, that really doesn't cut it as a patch description. Please look at
http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt and resubmit as one patch with an informative description.
Thanks,
Paul.
PATCH 1/1 Powerpc move of_irq_to_resource from prom.h to prom_parse.c
Powerpc move of_irq_to_resource from prom.h to prom_parse.c
Sorry for the lack of information, it got cut in the previous messages. Let's start all over again :
In the powerpc architecture, of_irq_to_resource, currently sitting in prom.h, needs irq_of_parse_and_map and NO_IRQ from asm-powerpc/irq.h. The solution suggested by Benjamin Herrenschmidt is to move it to arch/powerpc/kernel/prom_parse.c.
It applies on 2.6.20.
arch/powerpc/kernel/prom_parse.c +15 -0
@@ -1003,3 +1003,18 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irqreturn res; }EXPORT_SYMBOL_GPL (of_irq_map_one); + +int of_irq_to_resource (struct device_node *dev,int index,struct resource *r) +{ +int irq =irq_of_parse_and_map (dev, index); + +/* Only dereference the resource if both the +* resource and the irq are valid. */ +if (r && irq !=NO_IRQ ) { + r->start = r->end = irq; + r->flags =IORESOURCE_IRQ ; + } + +return irq; +} +EXPORT_SYMBOL_GPL (of_irq_to_resource);
include/asm-powerpc/prom.h +3 -14
@@ -19,6 +19,7 @@#include <linux/proc_fs.h> #include <linux/platform_device.h> #include <asm/atomic.h> +#include <asm/irq.h> /* Definitions used by the flattened device tree */ #define OF_DT_HEADER 0xd00dfeed/* marker */
@@ -334,20 +335,8 @@ extern int of_irq_map_one(struct device_node *device, int index,struct pci_dev ;extern int of_irq_map_pci (struct pci_dev *pdev,struct of_irq *out_irq); -static inline int of_irq_to_resource (struct device_node *dev,int index,struct resource *r) -{ -int irq =irq_of_parse_and_map (dev, index); - -/* Only dereference the resource if both the -* resource and the irq are valid. */ -if (r && irq !=NO_IRQ ) { - r->start = r->end = irq; - r->flags =IORESOURCE_IRQ ; - } - -return irq; -} - +extern int of_irq_to_resource (struct device_node *dev,int index, +struct resource *r);#endif /* __KERNEL__ */ #endif /* _POWERPC_PROM_H */
Signature · 3 lines
Mathieu Desnoyers Computer Engineering Graduate Student, École Polytechnique de Montréal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68