From: David S. Miller <davem@davemloft.net>
Date: Sun, 7 Dec 2008 08:46:33 +0000 (-0800)
Subject: sparc: Restore irq_trans_init() call in prom_create_node().
X-Git-Tag: v4.13~25591^2~28
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bf944c370ab181ada51c0754a2d13ae8543b149a;p=mirror_ubuntu-bionic-kernel.git

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: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc/kernel/prom.h b/arch/sparc/kernel/prom.h
index 0764b354b52c..bb0f0fda6cab 100644
--- a/arch/sparc/kernel/prom.h
+++ b/arch/sparc/kernel/prom.h
@@ -8,10 +8,7 @@ extern struct device_node *allnodes;	/* temporary while merging */
 extern rwlock_t devtree_lock;	/* temporary while merging */
 
 extern void * prom_early_alloc(unsigned long size);
-
-#ifdef CONFIG_SPARC64
 extern void irq_trans_init(struct device_node *dp);
-#endif
 
 extern unsigned int prom_unique_id;
 
diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c
index f21e8fc9a8fb..fe43e80772db 100644
--- a/arch/sparc/kernel/prom_32.c
+++ b/arch/sparc/kernel/prom_32.c
@@ -289,3 +289,7 @@ void __init of_console_init(void)
 void __init of_fill_in_cpu_data(void)
 {
 }
+
+void __init irq_trans_init(struct device_node *dp)
+{
+}
diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
index 2736f3d74c7f..4e9af593db49 100644
--- a/arch/sparc/kernel/prom_common.c
+++ b/arch/sparc/kernel/prom_common.c
@@ -243,10 +243,10 @@ static struct device_node * __init prom_create_node(phandle node,
 	dp->type = get_one_property(node, "device_type");
 	dp->node = node;
 
-	/* Build interrupts later... */
-
 	dp->properties = build_prop_list(node);
 
+	irq_trans_init(dp);
+
 	return dp;
 }