[PATCH] 2.6 - OF dynamic update __init funcs

John Rose johnrose at austin.ibm.com
Tue Dec 9 02:58:00 EST 2003


The current of_finish_dynamic_node() calls some prom.c functions that are
marked __init.  Since this function is for use after boot, the functions
should be changed to __devinit.  If there are no comments, I'll push this
to 2.6 shortly.

Thanks-
John

diff -Nru a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c
--- a/arch/ppc64/kernel/prom.c	Sun Dec  7 20:18:16 2003
+++ b/arch/ppc64/kernel/prom.c	Sun Dec  7 20:18:16 2003
@@ -1701,7 +1701,7 @@
 /*
  * Find the interrupt parent of a node.
  */
-static struct device_node * __init
+static struct device_node * __devinit
 intr_parent(struct device_node *p)
 {
 	phandle *parp;
@@ -1716,7 +1716,7 @@
  * Find out the size of each entry of the interrupts property
  * for a node.
  */
-static int __init
+static int __devinit
 prom_n_intr_cells(struct device_node *np)
 {
 	struct device_node *p;
@@ -1744,7 +1744,7 @@
  * Map an interrupt from a device up to the platform interrupt
  * descriptor.
  */
-static int __init
+static int __devinit
 map_interrupt(unsigned int **irq, struct device_node **ictrler,
 	      struct device_node *np, unsigned int *ints, int nintrc)
 {


** Sent via the linuxppc64-dev mail list. See http://lists.linuxppc.org/




More information about the Linuxppc64-dev mailing list