Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf944c37 authored by David S. Miller's avatar David S. Miller
Browse files

sparc: Restore irq_trans_init() call in prom_create_node(). 



This broke sparc64 in various ways.

Add an empty dummy hook in sparc32's prom_32.c so that we
can potentially handle things on that side similarly, and
in particular avoid a prom_common.c ifdef :-)

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d34dd829

arch/sparc/kernel/prom.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -8,10 +8,7 @@ extern struct device_node *allnodes; /* temporary while merging */ 
extern rwlock_t devtree_lock;	/* temporary while merging */

extern rwlock_t devtree_lock;	/* temporary while merging */





extern void * prom_early_alloc(unsigned long size);

extern void * prom_early_alloc(unsigned long size);



#ifdef CONFIG_SPARC64

extern void irq_trans_init(struct device_node *dp);

extern void irq_trans_init(struct device_node *dp);

#endif





extern unsigned int prom_unique_id;

extern unsigned int prom_unique_id;

arch/sparc/kernel/prom_32.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -289,3 +289,7 @@ void __init of_console_init(void) 
void __init of_fill_in_cpu_data(void)

void __init of_fill_in_cpu_data(void)

{

{

}

}



void __init irq_trans_init(struct device_node *dp)

{

}

arch/sparc/kernel/prom_common.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -243,10 +243,10 @@ static struct device_node * __init prom_create_node(phandle node, 
	dp->type = get_one_property(node, "device_type");

	dp->type = get_one_property(node, "device_type");

	dp->node = node;

	dp->node = node;





	/* Build interrupts later... */



	dp->properties = build_prop_list(node);

	dp->properties = build_prop_list(node);





	irq_trans_init(dp);



	return dp;

	return dp;

}

}